projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ad311b 9c23f06)
Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Fri, 20 May 2011 18:15:23 +0000 (20:15 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Fri, 20 May 2011 18:15:23 +0000 (20:15 +0200)
Fixed conflicts:
compiler/typecheck/TcSMonad.lhs

1  2 
compiler/typecheck/TcInstDcls.lhs patch | diff1 | diff2 | blob | history

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