Merge remote-tracking branch 'origin/master' into type-nats
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Tue, 20 Mar 2012 03:11:50 +0000 (20:11 -0700)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Tue, 20 Mar 2012 03:11:50 +0000 (20:11 -0700)
1  2 
compiler/hsSyn/Convert.lhs
compiler/hsSyn/HsTypes.lhs
compiler/parser/Parser.y.pp
compiler/parser/RdrHsSyn.lhs
compiler/rename/RnTypes.lhs
compiler/typecheck/TcForeign.lhs
compiler/typecheck/TcHsType.lhs
compiler/typecheck/TcType.lhs
compiler/types/FamInstEnv.lhs

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge