Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-new-flavor
authorDimitrios Vytiniotis <dimitris@microsoft.com>
Wed, 28 Mar 2012 08:56:29 +0000 (10:56 +0200)
committerDimitrios Vytiniotis <dimitris@microsoft.com>
Wed, 28 Mar 2012 08:56:29 +0000 (10:56 +0200)
commitb4b7647fedf0feab41d417c4e980bd08445ce559
tree004f4e966e1a1e3a5457b11c57cb7f9abf43a108
parentcc2d2e1d44405630fb34311dc3f5e42eadc5c6b1
parent9606231dd203163c8ca839b3f58c6e40a3805fa8
Merge branch 'master' of darcs.haskell.org/ghc into ghc-new-flavor
compiler/coreSyn/TrieMap.lhs
compiler/typecheck/TcCanonical.lhs
compiler/typecheck/TcErrors.lhs
compiler/typecheck/TcInteract.lhs
compiler/typecheck/TcMType.lhs
compiler/typecheck/TcSimplify.lhs
compiler/typecheck/TcUnify.lhs