[commit: ghc] wip/nfs-locking: Merge pull request #277 from KaiHa/ticket274 (eff3e36)

[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/eff3e36640d0c72e34411acdcbaef71646d884ae/ghc

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

commit eff3e36640d0c72e34411acdcbaef71646d884ae
Merge: e89ab5c ea51eaa
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Jul 24 17:51:26 2016 +0200

    Merge pull request #277 from KaiHa/ticket274
    
    Use in-tree cabal in build.cabal.sh



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

eff3e36640d0c72e34411acdcbaef71646d884ae
 build.cabal.sh | 1 +
 cabal.project  | 2 ++
 2 files changed, 3 insertions(+)