projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8fb6e59 7bb9684)
Merge branch 'master' of /Users/benl/devel/ghc/ghc-head
authorBen Lippmeier <benl@ouroborus.net>
Wed, 27 Apr 2011 06:40:48 +0000 (16:40 +1000)
committerBen Lippmeier <benl@ouroborus.net>
Wed, 27 Apr 2011 06:40:48 +0000 (16:40 +1000)
1  2 
compiler/main/StaticFlags.hs patch | diff1 | diff2 | blob | history
docs/users_guide/flags.xml patch | diff1 | diff2 | blob | history

diff --cc compiler/main/StaticFlags.hs
Simple merge
diff --cc docs/users_guide/flags.xml
Simple merge
Glasgow Haskell Compiler with heterogeneous metaprogramming (generalized arrows and modal types)