Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-kinds
http://hackage.haskell.org/trac/ghc/changeset/f24d21b15fa8e8beab60f4ee4e67a129f5af2a4d >--------------------------------------------------------------- commit f24d21b15fa8e8beab60f4ee4e67a129f5af2a4d Merge: aae6e1c... 000824d... Author: Julien Cretin <g...@ia0.eu> Date: Fri Sep 2 11:52:26 2011 +0200 Merge remote-tracking branch 'all/master' into ghc-kinds compiler/basicTypes/Name.lhs | 38 +++++++++++++------- compiler/basicTypes/RdrName.lhs | 6 +++- compiler/basicTypes/SrcLoc.lhs | 7 ---- compiler/hsSyn/Convert.lhs | 26 +++++++++---- compiler/main/DynFlags.hs | 3 ++ compiler/main/GHC.hs | 2 +- compiler/main/PprTyThing.hs | 5 +-- compiler/rename/RnNames.lhs | 73 ++++++++++++++++++++++++--------------- compiler/typecheck/TcBinds.lhs | 5 ++- compiler/typecheck/TcSplice.lhs | 3 +- compiler/types/FamInstEnv.lhs | 2 +- compiler/types/FunDeps.lhs | 4 +- compiler/types/InstEnv.lhs | 2 +- docs/users_guide/flags.xml | 6 +++ ghc/InteractiveUI.hs | 7 +++- includes/HaskellConstants.hs | 4 +- 16 files changed, 121 insertions(+), 72 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
