projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e79e580 ac51be0)
Merge remote-tracking branch 'origin/master'
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 4 May 2011 11:14:27 +0000 (12:14 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 4 May 2011 11:14:27 +0000 (12:14 +0100)

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