Merge in more HEAD, fix stuff up
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 23 Jan 2012 12:12:11 +0000 (12:12 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 23 Jan 2012 12:12:11 +0000 (12:12 +0000)
commitd0e3776f8e4d954160437db27465f1af3c2aea36
tree8373478c1aaa2405501424ef73a8b7cf033519db
parent23075169a7d85073cadb211835854436e533f046
parent3a3dcc31e401e48771d430f3bf02d5e019b6f997
Merge in more HEAD, fix stuff up
18 files changed:
compiler/coreSyn/CoreLint.lhs
compiler/deSugar/DsBinds.lhs
compiler/iface/TcIface.lhs
compiler/parser/Parser.y.pp
compiler/parser/RdrHsSyn.lhs
compiler/prelude/PrelNames.lhs
compiler/stgSyn/StgLint.lhs
compiler/typecheck/TcCanonical.lhs
compiler/typecheck/TcErrors.lhs
compiler/typecheck/TcEvidence.lhs
compiler/typecheck/TcForeign.lhs
compiler/typecheck/TcHsSyn.lhs
compiler/typecheck/TcInteract.lhs
compiler/typecheck/TcMType.lhs
compiler/typecheck/TcSimplify.lhs
compiler/typecheck/TcSplice.lhs
compiler/typecheck/TcType.lhs
compiler/typecheck/TcUnify.lhs