projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61d89bc 2d52051)
Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Tue, 10 May 2011 06:12:21 +0000 (08:12 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Tue, 10 May 2011 06:12:21 +0000 (08:12 +0200)

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