Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Wed, 13 Jun 2012 12:14:41 +0000 (13:14 +0100)
committerIan Lynagh <igloo@earth.li>
Wed, 13 Jun 2012 12:14:41 +0000 (13:14 +0100)
commitc3cf0419bbec99086e9ed63d4ba324639ba65fb8
tree424a8823e0a55e224d6c575d4b3a688812fbaef2
parentbfe94012ade96a7fa019d596c7639208a992470c
parent96a37685b4a16fda2a53a3130c69e05e4daff91d
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc

Fix conflicts in:
compiler/main/DynFlags.hs
compiler/ghci/ByteCodeGen.lhs
compiler/main/DynFlags.hs
compiler/main/HscMain.hs
compiler/main/HscTypes.lhs
compiler/parser/Lexer.x
compiler/rename/RnExpr.lhs
ghc/InteractiveUI.hs