[commit: ghc] new-demand-to-merge: Merge branch 'master' into new-demand-to-merge (f288a5b)
Ilya Sergey <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : new-demand-to-merge http://hackage.haskell.org/trac/ghc/changeset/f288a5b795a57c834e3192aaa8d2623a8f297413 >--------------------------------------------------------------- commit f288a5b795a57c834e3192aaa8d2623a8f297413 Merge: 26284ea... 092c0bd... Author: Ilya Sergey <[email protected]> Date: Tue Oct 30 13:10:46 2012 +0100 Merge branch 'master' into new-demand-to-merge .gitignore | 55 ++++++++++++++++-------------------------- compiler/cmm/CmmParse.y | 4 +- mk/config.mk.in | 13 ++++++++- rules/build-dependencies.mk | 13 +++++++++- utils/ghc-pkg/ghc.mk | 15 +++++++---- 5 files changed, 55 insertions(+), 45 deletions(-)