[commit: ghc] wip/nfs-locking: Merge pull request #260 from hvr/pr/unify-cabal-script (24d6d50)

[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/24d6d50c5d605aa32cfc5efcd2328480597cfda4/ghc

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

commit 24d6d50c5d605aa32cfc5efcd2328480597cfda4
Merge: 39f0509 af6a040
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sat Jun 4 23:41:34 2016 +0100

    Merge pull request #260 from hvr/pr/unify-cabal-script
    
    Merge build.cabal-new.sh into build.cabal.sh



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

24d6d50c5d605aa32cfc5efcd2328480597cfda4
 build.cabal-new.sh | 58 ------------------------------------------------------
 build.cabal.sh     | 50 +++++++++++++++++++++++++++++++++++-----------
 build.sh           |  9 +++++++++
 3 files changed, 48 insertions(+), 69 deletions(-)