projects / ghc-base.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 4817fca a07504a)
Merge branch 'master' of http://darcs.haskell.org/packages/base into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Mon, 2 May 2011 19:13:19 +0000 (21:13 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Mon, 2 May 2011 19:13:19 +0000 (21:13 +0200)
commite95046ebf2e4833b56c6ddaf5b3108390cee08a5
treeac67e202218ecc95dc904a3e3b5dfeba573c2ce9tree | snapshot
parent4817fca11f90708d2d307701f6d901d28ea5245ccommit | diff
parenta07504ab09e4c63e7ef25c13e4e97466c36a651acommit | diff
Merge branch 'master' of darcs.haskell.org/packages/base into ghc-generics

Solved conflicts:
GHC/Int.hs
GHC/Int.hs diff1 | diff2 | blob | history
GHC "base" library, with HetMet modifications