projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fdf8656 44fbccd)
Merge branch 'master' into ghc-new-co
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 20 Apr 2011 10:32:05 +0000 (11:32 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 20 Apr 2011 10:32:05 +0000 (11:32 +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)