[commit: ghc] wip/nfs-locking: Merge pull request #171 from snowleopard/angerman/feature/advanced-render-box (8a0380a)

[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/8a0380a71035774db6a874567e962e37d61089a5/ghc

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

commit 8a0380a71035774db6a874567e962e37d61089a5
Merge: 2024396 c7c45fc
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Fri Jan 15 13:41:06 2016 +0000

    Merge pull request #171 from snowleopard/angerman/feature/advanced-render-box
    
    advanced render box, fix #134 [skip ci]



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

8a0380a71035774db6a874567e962e37d61089a5
 src/Base.hs                       |  94 +--------------------------------
 src/Oracles/Config/CmdLineFlag.hs |  15 +++---
 src/Rules/Actions.hs              | 107 ++++++++++++++++++++++++++++++++++++--
 3 files changed, 111 insertions(+), 105 deletions(-)