Merge remote-tracking branch 'origin/master' into type-nats
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Wed, 25 Jan 2012 03:40:06 +0000 (19:40 -0800)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Wed, 25 Jan 2012 03:40:06 +0000 (19:40 -0800)
commit9c1575228173218a3cfa06ddbec3865b12d87713
tree52777ff46612b9b0d5135f7d79deb72ae8c1cabe
parentd0e3776f8e4d954160437db27465f1af3c2aea36
parentf438722414782adfb9800b574ec8a1d7d5eafbbf
Merge remote-tracking branch 'origin/master' into type-nats

Conflicts:
compiler/typecheck/TcEvidence.lhs
18 files changed:
compiler/deSugar/DsBinds.lhs
compiler/deSugar/DsExpr.lhs
compiler/deSugar/Match.lhs
compiler/iface/BinIface.hs
compiler/iface/TcIface.lhs
compiler/parser/Parser.y.pp
compiler/prelude/PrelNames.lhs
compiler/rename/RnTypes.lhs
compiler/typecheck/TcErrors.lhs
compiler/typecheck/TcEvidence.lhs
compiler/typecheck/TcForeign.lhs
compiler/typecheck/TcHsType.lhs
compiler/typecheck/TcInteract.lhs
compiler/typecheck/TcMType.lhs
compiler/typecheck/TcSplice.lhs
compiler/types/Coercion.lhs
compiler/vectorise/Vectorise/Type/Classify.hs
mk/validate-settings.mk