Fri Jan 21 07:01:19 PST 2011 Ian Lynagh <[email protected]>
* Resolve conflicts
M ./compiler/basicTypes/Id.lhs -3 +8
M ./compiler/basicTypes/IdInfo.lhs -7 +14
M ./compiler/basicTypes/MkId.lhs -12 +24
M ./compiler/coreSyn/CoreFVs.lhs -7 +7
M ./compiler/coreSyn/CoreSubst.lhs -1 +3
M ./compiler/coreSyn/CoreSyn.lhs -8 +22
M ./compiler/coreSyn/CoreTidy.lhs -1 +1
M ./compiler/coreSyn/CoreUnfold.lhs -4 +6
M ./compiler/coreSyn/CoreUtils.lhs -1 +1
M ./compiler/coreSyn/PprCore.lhs -2 +6
M ./compiler/deSugar/DsBinds.lhs -22 +8
M ./compiler/hsSyn/HsBinds.lhs -2 +1
M ./compiler/hsSyn/HsExpr.lhs-boot +4
M ./compiler/hsSyn/HsPat.lhs-boot +1
M ./compiler/iface/BinIface.hs -2 +13
M ./compiler/iface/IfaceSyn.lhs -7 +7
M ./compiler/iface/MkIface.lhs -2 +2
M ./compiler/iface/TcIface.lhs -3 +6
M ./compiler/main/TidyPgm.lhs -1 +1
M ./compiler/simplCore/Simplify.lhs -1 +1
M ./compiler/typecheck/Inst.lhs -3 +11
M ./compiler/typecheck/TcClassDcl.lhs -17 +7
M ./compiler/typecheck/TcDeriv.lhs -21 +22
M ./compiler/typecheck/TcEnv.lhs -2 +2
M ./compiler/typecheck/TcErrors.lhs -14 +21
M ./compiler/typecheck/TcHsType.lhs -28 +30
M ./compiler/typecheck/TcInstDcls.lhs -148 +127
M ./compiler/typecheck/TcMType.lhs -48 +33
M ./compiler/typecheck/TcSMonad.lhs -69 +1
M ./compiler/typecheck/TcSimplify.lhs -55 +5
M ./compiler/typecheck/TcType.lhs -5 +5
M ./compiler/typecheck/TcUnify.lhs -7 +4
M ./compiler/types/InstEnv.lhs -7 +17
M ./compiler/vectorise/Vectorise/Type/PADict.hs -1 +2
View patch online:
http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=ghc-7.0/ghc;a=darcs_commitdiff;h=20110121150119-3fd76-fb53641086968699c8f7a6c72c7fda651eb7864f.gz
_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc
