projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 3deca8f 9330f8d)
Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/ghc
authorMax Bolingbroke <batterseapower@hotmail.com>
Sun, 3 Apr 2011 15:55:20 +0000 (16:55 +0100)
committerMax Bolingbroke <batterseapower@hotmail.com>
Sun, 3 Apr 2011 15:55:20 +0000 (16:55 +0100)

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