projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9ae7aca fd6587b)
Merge branch 'master' of /Users/benl/devel/ghc/ghc-head
authorBen Lippmeier <benl@ouroborus.net>
Thu, 12 May 2011 12:38:13 +0000 (22:38 +1000)
committerBen Lippmeier <benl@ouroborus.net>
Thu, 12 May 2011 12:38:13 +0000 (22:38 +1000)

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