projects / ghc-hetmet.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9241426 24c0c8c)
Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Mon, 2 May 2011 18:48:10 +0000 (20:48 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Mon, 2 May 2011 18:48:10 +0000 (20:48 +0200)
1  2 
compiler/main/DynFlags.hs patch | diff1 | diff2 | blob | history

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