Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 6 Feb 2013 12:54:33 +0000 (12:54 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 6 Feb 2013 12:54:33 +0000 (12:54 +0000)
commit74f9f8f045d7a1a44008933c0271a38a4fb8ab09
tree56a38ad1ff9bb612e6aa77123726f204fa61a6f9
parent21f00c32e55f13f995006990608b7d68ba98299f
parentca106a106f79d3d12befa3844b25a8f0d0733b04
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
compiler/typecheck/TcUnify.lhs
compiler/types/Coercion.lhs
compiler/types/TypeRep.lhs