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)
commita47ee23a82a669808569b3865383bf932b67fa95
tree44fb218140bc01f507de47ed617d3734094112b0
parent829be0669c43ecf57c3a5b8b91e194c8f81bb490
parent388e1e825f79f2d16536fc583a48e5ce9c191b06
Merge branch 'master' of darcs.haskell.org/ghc
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