projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fbf4bc1 0d3a6d5)
Merge branch 'ghc-generics' of http://darcs.haskell.org/ghc into ghc-generics
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 5 May 2011 08:00:27 +0000 (09:00 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 5 May 2011 08:00:27 +0000 (09:00 +0100)
1  2 
compiler/typecheck/TcDeriv.lhs patch | diff1 | diff2 | blob | history

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