projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 00f0ddf 927df64)
Merge remote branch 'working/master'
authorSimon Marlow <marlowsd@gmail.com>
Mon, 6 Jun 2011 10:39:00 +0000 (11:39 +0100)
committerSimon Marlow <marlowsd@gmail.com>
Mon, 6 Jun 2011 10:39:00 +0000 (11:39 +0100)
1  2 
compiler/main/HscTypes.lhs patch | diff1 | diff2 | blob | history

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