[commit: testsuite] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//testsuite (eed0564)
Ian Lynagh <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/testsuite On branch : master http://hackage.haskell.org/trac/ghc/changeset/eed0564e57eff9808aa1bb4ae6230f53ac184d23 >--------------------------------------------------------------- commit eed0564e57eff9808aa1bb4ae6230f53ac184d23 Merge: 90033bb... 46a856a... Author: Ian Lynagh <[email protected]> Date: Tue Oct 30 13:04:56 2012 +0000 Merge branch 'master' of darcs.haskell.org:/srv/darcs//testsuite Conflicts: mk/test.mk mk/ghc-config.hs | 64 +++++++++++++++++---------- tests/codeGen/should_run/T7319.hs | 11 +++++ tests/codeGen/should_run/T7319.stderr | 5 ++ tests/codeGen/should_run/all.T | 6 +++ tests/ghci.debugger/scripts/break011.stdout | 4 +- 5 files changed, 64 insertions(+), 26 deletions(-)