Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Thu, 19 Jul 2012 19:38:05 +0000 (20:38 +0100)
committerIan Lynagh <igloo@earth.li>
Thu, 19 Jul 2012 19:38:05 +0000 (20:38 +0100)
commit322044b2670fe9dca22122dbf4cc79fa29b4442c
treee3226359676fab1cc0560f6ed827d598fb2ddfc5
parentfb0769b62e3ea4392ad970f8913a76187fead79f
parent0f693381e356ec90ee72ab40b21b74cbf4e20eb3
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
compiler/cmm/PprCmm.hs
compiler/ghc.cabal.in
compiler/hsSyn/Convert.lhs
compiler/main/DynFlags.hs
compiler/parser/Lexer.x
compiler/rename/RnExpr.lhs
compiler/typecheck/TcTyClsDecls.lhs
compiler/utils/Outputable.lhs
docs/users_guide/flags.xml