Merge remote-tracking branch 'origin/master' into wip/new-flatten-skolems-Aug14
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 16 Oct 2014 08:05:19 +0000 (09:05 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 16 Oct 2014 08:05:19 +0000 (09:05 +0100)
commitdae919a0f6b90d295fef3ebe4f2695db2eb6790b
treea476efeacb82ee79071e54ff9a5e35aa835b9980
parent22b36492fba7b86a5fd2ab8277dd9cd33c7f6b2f
parentd7867810d5ffd08c77c30e928bb3dca21beae0b9
Merge remote-tracking branch 'origin/master' into wip/new-flatten-skolems-Aug14

Conflicts:
compiler/typecheck/TcRnTypes.lhs
compiler/typecheck/TcSMonad.lhs
testsuite/tests/typecheck/should_fail/ContextStack2.stderr
testsuite/tests/typecheck/should_fail/FrozenErrorTests.stderr
testsuite/tests/typecheck/should_run/T5751.hs
12 files changed:
compiler/deSugar/DsBinds.lhs
compiler/simplCore/Simplify.lhs
compiler/typecheck/TcInstDcls.lhs
compiler/typecheck/TcPat.lhs
compiler/typecheck/TcRnTypes.lhs
compiler/typecheck/TcSMonad.lhs
rts/RtsStartup.c
testsuite/tests/th/all.T
testsuite/tests/typecheck/should_fail/ContextStack2.stderr
testsuite/tests/typecheck/should_fail/FrozenErrorTests.stderr
testsuite/tests/typecheck/should_run/T5751.hs
testsuite/tests/typecheck/should_run/tcrun036.hs