projects / ghc-hetmet.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c25b934 c8c2f6b)
Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Thu, 12 May 2011 11:26:03 +0000 (13:26 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Thu, 12 May 2011 11:26:03 +0000 (13:26 +0200)
commit1b381af863d64aaa0a4dd9c816170c58e6131a9e
tree52fa1f1af2d5256e5f475e3c6dd00630d53fb35dtree | snapshot
parentc25b934ef544fa3eba0a9f9da41b363c470156cbcommit | diff
parentc8c2f6bb7d79a2a6aeaa3233363fdf0bbbfad205commit | diff
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics

Resolved conflicts:
compiler/typecheck/TcTyClsDecls.lhs
27 files changed:
compiler/basicTypes/MkId.lhs diff1 | diff2 | blob | history
compiler/deSugar/Check.lhs diff1 | diff2 | blob | history
compiler/hsSyn/HsBinds.lhs diff1 | diff2 | blob | history
compiler/hsSyn/HsPat.lhs diff1 | diff2 | blob | history
compiler/hsSyn/HsUtils.lhs diff1 | diff2 | blob | history
compiler/iface/BinIface.hs diff1 | diff2 | blob | history
compiler/iface/BuildTyCl.lhs diff1 | diff2 | blob | history
compiler/iface/IfaceSyn.lhs diff1 | diff2 | blob | history
compiler/iface/MkIface.lhs diff1 | diff2 | blob | history
compiler/iface/TcIface.lhs diff1 | diff2 | blob | history
compiler/main/DynFlags.hs diff1 | diff2 | blob | history
compiler/prelude/PrelNames.lhs diff1 | diff2 | blob | history
compiler/prelude/TysWiredIn.lhs diff1 | diff2 | blob | history
compiler/rename/RnBinds.lhs diff1 | diff2 | blob | history
compiler/rename/RnTypes.lhs diff1 | diff2 | blob | history
compiler/typecheck/TcDeriv.lhs diff1 | diff2 | blob | history
compiler/typecheck/TcEnv.lhs diff1 | diff2 | blob | history
compiler/typecheck/TcGenDeriv.lhs diff1 | diff2 | blob | history
compiler/typecheck/TcHsType.lhs diff1 | diff2 | blob | history
compiler/typecheck/TcInstDcls.lhs diff1 | diff2 | blob | history
compiler/typecheck/TcPat.lhs diff1 | diff2 | blob | history
compiler/typecheck/TcRnDriver.lhs diff1 | diff2 | blob | history
compiler/typecheck/TcSMonad.lhs diff1 | diff2 | blob | history
compiler/typecheck/TcTyClsDecls.lhs diff1 | diff2 | blob | history
compiler/types/TyCon.lhs diff1 | diff2 | blob | history
compiler/types/Type.lhs diff1 | diff2 | blob | history
docs/users_guide/flags.xml diff1 | diff2 | blob | history
Glasgow Haskell Compiler with heterogeneous metaprogramming (generalized arrows and modal types)