projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35a1ec4 3c28748)
Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 21 Apr 2011 08:00:43 +0000 (09:00 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 21 Apr 2011 08:00:43 +0000 (09:00 +0100)

Trivial merge
Glasgow Haskell Compiler with heterogeneous metaprogramming (generalized arrows and modal types)