Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
authorIan Lynagh <igloo@earth.li>
Wed, 25 Jul 2012 11:30:43 +0000 (12:30 +0100)
committerIan Lynagh <igloo@earth.li>
Wed, 25 Jul 2012 11:30:43 +0000 (12:30 +0100)
commit5d2a1e65dfd0d49c3763eef048d2605e26483ed2
treed41889ee647e08be825fdf101aff151ca8525049
parent55881ff86d810f9bb81533e72a9e3c73aa5e53f9
parentc9733e263906eaf13b3cc585e76f42e8bddbde4c
Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc
compiler/deSugar/Desugar.lhs
compiler/main/DynFlags.hs
mk/validate-settings.mk