projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4058965 a28ed19)
Merge branch 'master' of /home/simonmar/ghc-git
authorSimon Marlow <marlowsd@gmail.com>
Tue, 5 Apr 2011 15:03:25 +0000 (16:03 +0100)
committerSimon Marlow <marlowsd@gmail.com>
Tue, 5 Apr 2011 15:03:25 +0000 (16:03 +0100)

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