Merge branch 'no-pred-ty'
authorMax Bolingbroke <batterseapower@hotmail.com>
Fri, 9 Sep 2011 12:45:41 +0000 (13:45 +0100)
committerMax Bolingbroke <batterseapower@hotmail.com>
Fri, 9 Sep 2011 13:11:00 +0000 (14:11 +0100)
commitb3bc5f4f49a01be12aff0e4369db62331c147179
tree0321f6f04b86128e236e265a353313e05381e632
parentc2bd94c1d91dcd90007fe9f33b8e45ceb509c995
parent99a52b00cc77a38f66202ddb3d6ce1dd4a654081
Merge branch 'no-pred-ty'

Conflicts:
compiler/iface/BuildTyCl.lhs
compiler/iface/MkIface.lhs
compiler/iface/TcIface.lhs
compiler/typecheck/TcTyClsDecls.lhs
compiler/types/Class.lhs
compiler/utils/Util.lhs
22 files changed:
compiler/basicTypes/OccName.lhs
compiler/deSugar/DsMeta.hs
compiler/hsSyn/Convert.lhs
compiler/iface/BinIface.hs
compiler/iface/BuildTyCl.lhs
compiler/iface/IfaceSyn.lhs
compiler/iface/MkIface.lhs
compiler/iface/TcIface.lhs
compiler/parser/Parser.y.pp
compiler/parser/RdrHsSyn.lhs
compiler/rename/RnSource.lhs
compiler/simplCore/Simplify.lhs
compiler/specialise/SpecConstr.lhs
compiler/typecheck/TcClassDcl.lhs
compiler/typecheck/TcEnv.lhs
compiler/typecheck/TcInstDcls.lhs
compiler/typecheck/TcMType.lhs
compiler/typecheck/TcRnDriver.lhs
compiler/typecheck/TcTyClsDecls.lhs
compiler/types/Class.lhs
compiler/utils/Util.lhs
docs/users_guide/glasgow_exts.xml