merge upstream
authorAdam Megacz <megacz@cs.berkeley.edu>
Tue, 14 Jun 2011 18:50:10 +0000 (11:50 -0700)
committerAdam Megacz <megacz@cs.berkeley.edu>
Tue, 14 Jun 2011 18:50:10 +0000 (11:50 -0700)
commit7e95df790b34e11d7308e43dab0a7175b69b70fc
tree30ef9b0cf16f21709ab07ef6488661cc27db3fe1
parentc0687066474aa4ce4912f31a5c09c1bcd673fb06
parentffd3bd85a6febeec05c99d0da7dfdf34cad59caf
merge upstream
16 files changed:
compiler/basicTypes/Name.lhs
compiler/deSugar/Desugar.lhs
compiler/ghc.cabal.in
compiler/hsSyn/HsTypes.lhs
compiler/iface/BinIface.hs
compiler/iface/TcIface.lhs
compiler/main/DynFlags.hs
compiler/parser/Lexer.x
compiler/parser/Parser.y.pp
compiler/prelude/PrelNames.lhs
compiler/rename/RnEnv.lhs
compiler/rename/RnHsSyn.lhs
compiler/typecheck/TcHsSyn.lhs
compiler/typecheck/TcHsType.lhs
compiler/typecheck/TcRnMonad.lhs
ghc.mk