Merge remote-tracking branch 'origin/master' into type-nats
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Sat, 7 Jan 2012 21:56:17 +0000 (13:56 -0800)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Sat, 7 Jan 2012 21:56:17 +0000 (13:56 -0800)
commitf784eb7585901e2297d504dcf777ebc58d60aaa5
tree7bf8bc625882724f5db96121c327ee3e80ae781a
parent7655c718d56666a918c06f6d4e32d98482620b9c
parenta5b365ac3ea7277817541f8bc3341eecfb083490
Merge remote-tracking branch 'origin/master' into type-nats
compiler/codeGen/ClosureInfo.lhs
compiler/iface/BinIface.hs
compiler/iface/IfaceSyn.lhs
compiler/iface/TcIface.lhs
compiler/typecheck/TcInteract.lhs
compiler/typecheck/TcMType.lhs
compiler/typecheck/TcSplice.lhs
compiler/types/Coercion.lhs
compiler/types/FamInstEnv.lhs
compiler/types/Kind.lhs