projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1bf40a4 e2e0785)
Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 13 Jun 2011 13:39:43 +0000 (14:39 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 13 Jun 2011 13:39:43 +0000 (14:39 +0100)
1  2 
compiler/typecheck/TcBinds.lhs patch | diff1 | diff2 | blob | history

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