projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: febf1ce)
Merge remote branch 'origin/master'
authorDimitrios Vytiniotis <dimitris@microsoft.com>
Wed, 18 May 2011 13:12:46 +0000 (14:12 +0100)
committerDimitrios Vytiniotis <dimitris@microsoft.com>
Wed, 18 May 2011 13:12:46 +0000 (14:12 +0100)
Fixed conflicts in:
compiler/typecheck/TcCanonical.lhs
compiler/typecheck/TcErrors.lhs
compiler/typecheck/TcInteract.lhs


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