projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a1aab7 72d4ef3)
Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 9 May 2011 17:10:57 +0000 (18:10 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 9 May 2011 17:10:57 +0000 (18:10 +0100)

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