projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 067268c 0cb84f3)
Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Fri, 1 Apr 2011 15:47:06 +0000 (16:47 +0100)
committerIan Lynagh <igloo@earth.li>
Fri, 1 Apr 2011 15:47:06 +0000 (16:47 +0100)

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