projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3664c19 97ce7b5)
Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 26 May 2011 16:22:02 +0000 (17:22 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 26 May 2011 16:22:02 +0000 (17:22 +0100)

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