Merge branch 'no-pred-ty'
authorMax Bolingbroke <batterseapower@hotmail.com>
Fri, 9 Sep 2011 12:40:10 +0000 (13:40 +0100)
committerMax Bolingbroke <batterseapower@hotmail.com>
Fri, 9 Sep 2011 12:40:10 +0000 (13:40 +0100)
commit09af1e9b4f8151a8b32e05ff7041cebe1edec1be
tree90d6179e372c5197450de796c654f9cbe85f4ec5
parent3723ffd41a728feced8ba99059253c03814689cc
parent9857fca7e233be6206c101625a62c52266b88767
Merge branch 'no-pred-ty'

Conflicts:
tests/safeHaskell/safeLanguage/all.T
tests/safeHaskell/unsafeLibs/all.T
tests/typecheck/should_compile/all.T
tests/typecheck/should_compile/tc250.hs
tests/typecheck/should_compile/tc251.hs
testsuite/tests/safeHaskell/safeLanguage/all.T
testsuite/tests/safeHaskell/unsafeLibs/all.T
testsuite/tests/typecheck/should_compile/all.T
testsuite/tests/typecheck/should_compile/tc251.hs
testsuite/tests/typecheck/should_compile/tc255.hs
testsuite/tests/typecheck/should_compile/tc256.hs
testsuite/tests/typecheck/should_fail/all.T