Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 25 Jan 2013 12:50:03 +0000 (12:50 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 25 Jan 2013 12:50:03 +0000 (12:50 +0000)
1  2 
compiler/basicTypes/DataCon.lhs
compiler/iface/BinIface.hs
compiler/iface/IfaceSyn.lhs
compiler/iface/MkIface.lhs
compiler/iface/TcIface.lhs
compiler/simplCore/Simplify.lhs
compiler/typecheck/TcTyClsDecls.lhs
compiler/types/TyCon.lhs

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge