[commit: ghc] wip/nfs-locking: Merge pull request #258 from KaiHa/ticket/247 (20d7082)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/20d70820a2c2fc7bfecacf79906db129d157846d/ghc

>---------------------------------------------------------------

commit 20d70820a2c2fc7bfecacf79906db129d157846d
Merge: 45b5f13 123bdb3
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue May 31 07:10:48 2016 +0100

    Merge pull request #258 from KaiHa/ticket/247
    
    Enable optional UserSettings.hs file



>---------------------------------------------------------------

20d70820a2c2fc7bfecacf79906db129d157846d
 .gitignore                                |   3 +
 README.md                                 |   3 +-
 doc/user-settings.md                      |   5 +-
 hadrian.cabal                             |   3 +-
 src/Settings/User.hs                      | 103 ++----------------------------
 src/{Settings/User.hs => UserSettings.hs} |   8 ++-
 6 files changed, 20 insertions(+), 105 deletions(-)