projects / ghc-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7e0984f 479397b)
Merge branch 'ghc-generics' of http://darcs.haskell.org/packages/base into ghc-generics
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 25 May 2011 06:54:29 +0000 (07:54 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 25 May 2011 06:54:29 +0000 (07:54 +0100)

Trivial merge
GHC "base" library, with HetMet modifications