projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2691104 44fbccd)
Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 19 Apr 2011 10:42:38 +0000 (11:42 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 19 Apr 2011 10:42:38 +0000 (11:42 +0100)

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