projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9992bfb 0b43244)
Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 10 Jun 2011 18:54:49 +0000 (19:54 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 10 Jun 2011 18:54:49 +0000 (19:54 +0100)
1  2 
compiler/rename/RnNames.lhs patch | diff1 | diff2 | blob | history

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