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)
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -23,10 -25,8 +25,9 @@@ import Coercion( mkAxInstRHS 
  
  import Id 
  import Var
- import VarEnv ( ) -- unitVarEnv, mkInScopeSet
  
  import TcType
 +import PrelNames (typeNatClassName)
  
  import Class
  import TyCon
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge