projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2a86d5c 88e9830)
Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/ghc
authorMax Bolingbroke <batterseapower@hotmail.com>
Sat, 2 Apr 2011 23:04:24 +0000 (00:04 +0100)
committerMax Bolingbroke <batterseapower@hotmail.com>
Sat, 2 Apr 2011 23:04:24 +0000 (00:04 +0100)

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