Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : ghc-kinds
http://hackage.haskell.org/trac/ghc/changeset/482a2f3d02ad60507420c26df2dedd9738dba432 >--------------------------------------------------------------- commit 482a2f3d02ad60507420c26df2dedd9738dba432 Merge: f16e15b... 395a9c5... Author: Julien Cretin <g...@ia0.eu> Date: Thu Sep 1 12:11:33 2011 +0200 Merge remote-tracking branch 'all/master' into ghc-kinds tests/codeGen/should_run/cgrun071.hs | 22 ++++++++++++------- tests/codeGen/should_run/cgrun071.stdout | 10 ++++---- tests/indexed-types/should_fail/SimpleFail10.hs | 2 +- .../indexed-types/should_fail/SimpleFail10.stderr | 6 ----- tests/indexed-types/should_fail/SimpleFail2a.hs | 2 +- .../indexed-types/should_fail/SimpleFail2a.stderr | 9 ++++--- .../indexed-types/should_fail/SimpleFail2b.stderr | 8 +++--- tests/indexed-types/should_fail/SimpleFail4.stderr | 6 ++-- tests/indexed-types/should_fail/SimpleFail9.stderr | 2 +- tests/indexed-types/should_fail/T4485.stderr | 2 +- tests/indexed-types/should_fail/all.T | 2 +- tests/parser/should_fail/T3811d.stderr | 5 +-- tests/parser/should_fail/readFail025.stderr | 4 +- 13 files changed, 40 insertions(+), 40 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
