Merge branch 'coloured-core' of https://github.com/nominolo/ghc into coloured-core
authorIan Lynagh <igloo@earth.li>
Sun, 8 May 2011 15:13:33 +0000 (16:13 +0100)
committerIan Lynagh <igloo@earth.li>
Sun, 8 May 2011 15:13:33 +0000 (16:13 +0100)
commitd45197aabb22178066a8ec50d29331786a0c518c
treefeac564466e2d1182b8d0ee7691580f564cf5b17
parentc5f7496604b096277e3ba57fcb6ed85422613c75
parentdaead6bf93cc751417461507048db9b1aa8b669a
Merge branch 'coloured-core' of https://github.com/nominolo/ghc into coloured-core
compiler/basicTypes/Module.lhs
compiler/main/DynFlags.hs
compiler/nativeGen/AsmCodeGen.lhs
compiler/typecheck/TcRnMonad.lhs
compiler/utils/Outputable.lhs