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)
commit646d997dc6eca8d8395071429a526462fa14287a
treea317e731c7c365d7e4bd8cc964c42d36ac656e12
parent924142621ebc30a3c16368e0df3466ee14185ddd
parent24c0c8c2040e7050fd5306afc85378eb94a06bd2
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics
compiler/main/DynFlags.hs