[commit: ghc] wip/nfs-locking: Merge pull request #13 from bgamari/master (e801ee0)

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

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

commit e801ee01698baa20d7a56e57768104f74ac35ffa
Merge: 0c9d7d8 c7a0c19
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Dec 20 21:04:59 2015 +0000

    Merge pull request #13 from bgamari/master
    
    Consolidate box pretty-printing



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

e801ee01698baa20d7a56e57768104f74ac35ffa
 src/Base.hs          | 64 +++++++++++++++++++++++++++++++++++++---------------
 src/Rules/Actions.hs | 20 ++--------------
 src/Rules/Library.hs | 11 +++++----
 src/Rules/Program.hs | 11 +++++----
 4 files changed, 60 insertions(+), 46 deletions(-)