[commit: testsuite] overlapping-tyfams: Merge branch 'master' into overlapping-tyfams (741f6be)
Richard Eisenberg <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : overlapping-tyfams http://hackage.haskell.org/trac/ghc/changeset/741f6be1ffa435bb31752af9e16d7e4039749d2d >--------------------------------------------------------------- commit 741f6be1ffa435bb31752af9e16d7e4039749d2d Merge: 4dd52e0... f639a1b... Author: Richard Eisenberg <[email protected]> Date: Tue Dec 4 13:58:23 2012 -0500 Merge branch 'master' into overlapping-tyfams mk/boilerplate.mk | 3 +++ tests/safeHaskell/check/pkg01/all.T | 6 +++++- tests/simplCore/should_compile/T7162.hs | 9 +++++++++ .../should_compile/T7162.stderr} | 0 tests/simplCore/should_compile/all.T | 1 + tests/th/T5358.stderr | 8 -------- tests/th/all.T | 2 +- 7 files changed, 19 insertions(+), 10 deletions(-)