projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 5ccf658)
Merge remote branch 'origin/master' into monad-comp
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 28 Apr 2011 10:50:15 +0000 (11:50 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 28 Apr 2011 10:50:15 +0000 (11:50 +0100)
Conflicts:
compiler/main/HscMain.lhs


No differences found
Glasgow Haskell Compiler with heterogeneous metaprogramming (generalized arrows and modal types)