projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 36df2f3 96d64fe)
Merge branch 'master' of /home/simonmar/ghc-git/.
authorSimon Marlow <marlowsd@gmail.com>
Mon, 23 May 2011 09:24:53 +0000 (10:24 +0100)
committerSimon Marlow <marlowsd@gmail.com>
Mon, 23 May 2011 09:24:53 +0000 (10:24 +0100)
* 'master' of /home/simonmar/ghc-git/.:
  Revert "Add capability sets to the event system. Contains code from Duncan Coutts."


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