projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9dcc8bb 44fbccd)
Merge branch 'master' into ghc-generics
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 20 Apr 2011 11:13:44 +0000 (12:13 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 20 Apr 2011 11:13:44 +0000 (12:13 +0100)

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