projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: cbebca1 9fb9395)
Merge remote branch 'origin/master'
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 11 May 2011 16:28:26 +0000 (17:28 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 11 May 2011 16:28:26 +0000 (17:28 +0100)

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