Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 21 Jul 2011 16:22:47 +0000 (17:22 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 21 Jul 2011 16:22:47 +0000 (17:22 +0100)
1  2 
compiler/hsSyn/Convert.lhs
compiler/simplCore/CoreMonad.lhs
compiler/typecheck/TcSplice.lhs

Simple merge
@@@ -11,8 -11,10 +11,8 @@@ module CoreMonad 
      CoreToDo(..), runWhen, runMaybe,
      SimplifierMode(..),
      FloatOutSwitches(..),
-     dumpSimplPhase,
+     dumpSimplPhase, pprPassDetails, 
  
 -    defaultGentleSimplToDo,
 -    
      -- * Plugins
      PluginPass, Plugin(..), CommandLineOption, 
      defaultPlugin, bindsOnlyPass,
Simple merge