projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e01036f 24c0c8c)
Merge remote branch 'origin/master' into monad-comp
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 4 May 2011 10:37:02 +0000 (11:37 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 4 May 2011 10:37:02 +0000 (11:37 +0100)
1  2 
compiler/main/DynFlags.hs patch | diff1 | diff2 | blob | history

diff --cc compiler/main/DynFlags.hs
Simple merge
Glasgow Haskell Compiler with heterogeneous metaprogramming (generalized arrows and modal types)