Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Tue, 17 May 2011 06:51:09 +0000 (08:51 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Tue, 17 May 2011 06:51:09 +0000 (08:51 +0200)
commit2d4d636af091b8da27466b5cf90011395a9c2f66
tree2736ea0c2cb58a223617308785a7250d1d8586bc
parentd872133bb986dbd15959cbb14504bf9a863e3e4a
parent52cba3c47b25a78402e542ff63dc905fc5b26b62
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics
compiler/deSugar/Check.lhs
compiler/deSugar/DsMeta.hs
compiler/hsSyn/HsBinds.lhs
compiler/hsSyn/HsUtils.lhs
compiler/main/DynFlags.hs
compiler/parser/Lexer.x