[commit: ghc] wip/nfs-locking: Merge pull request #253 from michalt/colors/1 (a9f43e5)

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

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

commit a9f43e59a1f84108a779b1ce835b5357f47b8e0f
Merge: 03f89a6 0f7bc96
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Mon May 16 13:46:36 2016 +0100

    Merge pull request #253 from michalt/colors/1
    
    Check if the output supports colors, see #244



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

a9f43e59a1f84108a779b1ce835b5357f47b8e0f
 build.cabal-new.sh |  1 -
 build.cabal.sh     |  1 -
 build.sh           |  1 -
 build.stack.sh     |  1 -
 src/Base.hs        | 12 ++++++++++--
 5 files changed, 10 insertions(+), 6 deletions(-)