projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d4780d4 6ac1eeb)
Merge remote branch 'origin/master'
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 4 May 2011 22:10:42 +0000 (23:10 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 4 May 2011 22:10:42 +0000 (23:10 +0100)

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