Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master
http://hackage.haskell.org/trac/ghc/changeset/cb1c60ebfb878e9ea9bc13767b6777554aca11ff >--------------------------------------------------------------- commit cb1c60ebfb878e9ea9bc13767b6777554aca11ff Merge: 29db350... 573a548... Author: Simon Peyton Jones <[email protected]> Date: Sat Mar 17 00:59:37 2012 +0000 Merge branch 'master' of http://darcs.haskell.org//testsuite Conflicts: tests/polykinds/all.T tests/simplCore/should_run/T5915.stdout tests/polykinds/PolyKinds06.hs | 2 +- tests/polykinds/T5935.hs | 13 +++++++++++++ tests/polykinds/all.T | 2 ++ tests/th/T1541.hs | 11 +++++++++++ tests/th/T5882.hs | 11 +++++++++++ tests/th/T5883.hs | 12 ++++++++++++ tests/th/T5883.stderr | 12 ++++++++++++ tests/th/T5886.hs | 8 ++++++++ tests/th/T5886a.hs | 14 ++++++++++++++ tests/th/all.T | 5 +++++ 10 files changed, 89 insertions(+), 1 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
