Merge branch 'master' into type-nats
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Mon, 17 Jan 2011 00:26:23 +0000 (16:26 -0800)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Mon, 17 Jan 2011 00:26:23 +0000 (16:26 -0800)
commit58c9e60e94fd91c9df7c2578ad22f6b014c7fdc6
tree6dc059e2e42e5035f221ccf5aeb6b41730ecdd1e
parent3151f79aa7e5e7057439aafc832604fa7e91dd88
parent915bf16e514a1fdb2ed354b22d035dfec3c0cdd0
Merge branch 'master' into type-nats

Conflicts:
compiler/typecheck/TcMType.lhs
compiler/typecheck/TcSMonad.lhs
14 files changed:
compiler/basicTypes/OccName.lhs
compiler/typecheck/TcCanonical.lhs
compiler/typecheck/TcErrors.lhs
compiler/typecheck/TcHsSyn.lhs
compiler/typecheck/TcHsType.lhs
compiler/typecheck/TcInteract.lhs
compiler/typecheck/TcMType.lhs
compiler/typecheck/TcSMonad.lhs
compiler/typecheck/TcSimplify.lhs
compiler/typecheck/TcSplice.lhs
compiler/typecheck/TcType.lhs
compiler/typecheck/TcUnify.lhs
compiler/types/FamInstEnv.lhs
compiler/types/Unify.lhs