projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 091fcea a1fae73)
Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Fri, 10 Jun 2011 17:39:53 +0000 (18:39 +0100)
committerIan Lynagh <igloo@earth.li>
Fri, 10 Jun 2011 17:39:53 +0000 (18:39 +0100)
1  2 
compiler/typecheck/TcRnMonad.lhs patch | diff1 | diff2 | blob | history

diff --cc compiler/typecheck/TcRnMonad.lhs
Simple merge
Glasgow Haskell Compiler with heterogeneous metaprogramming (generalized arrows and modal types)