projects / ghc-hetmet.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit7fd719237b68a356f80269ff083c073acec6f8f0
treec6c354c9a4bdfd4ed8b57d84ef3f1c13ac20ff81tree | snapshot
parent6ad311b7965a7af86f3b931b134215dff76f5fbbcommit | diff
parent9c23f06f3eb925dca063d5102b0ced4a9afe795ecommit | diff
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics

Fixed conflicts:
compiler/typecheck/TcSMonad.lhs
compiler/typecheck/TcInstDcls.lhs diff1 | diff2 | blob | history
Glasgow Haskell Compiler with heterogeneous metaprogramming (generalized arrows and modal types)