[commit: ghc] wip/nfs-locking: Merge pull request #154 from snowleopard/angerman/feature/build-info-flags (57c6497)

[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/57c6497776b08bd0548a094fa96b21977ae54254/ghc

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

commit 57c6497776b08bd0548a094fa96b21977ae54254
Merge: 86f3052 f794e73
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Tue Jan 12 22:41:37 2016 +0000

    Merge pull request #154 from snowleopard/angerman/feature/build-info-flags
    
    Add Advanced render box styles [skip ci]



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

57c6497776b08bd0548a094fa96b21977ae54254
 shaking-up-ghc.cabal              |  1 +
 src/Base.hs                       | 52 ++++++++++++++++++++++++++++++++++--
 src/Main.hs                       |  7 ++++-
 src/Oracles/Config/CmdLineFlag.hs | 56 +++++++++++++++++++++++++++++++++++++++
 src/Rules/Actions.hs              | 20 +++++---------
 src/Rules/Library.hs              |  9 +++----
 src/Rules/Program.hs              | 11 ++++----
 7 files changed, 129 insertions(+), 27 deletions(-)