Merge branch 'master' into type-nats
authorIavor S. Diatchki <iavor.diatchki@gmail.com>
Sun, 19 Jun 2011 05:44:04 +0000 (22:44 -0700)
committerIavor S. Diatchki <iavor.diatchki@gmail.com>
Sun, 19 Jun 2011 05:44:04 +0000 (22:44 -0700)
commit1420296489645dcb7f0af48ba145788c4201a7e0
tree6f1c55fc556625ec73049b9116b8df819e376d3c
parent74838b2efba3374c3813ec6e94d5f6628bee5967
parent530e25a6a1aaccc14630842f310bb4194ce97be0
Merge branch 'master' into type-nats
15 files changed:
compiler/deSugar/DsBinds.lhs
compiler/ghc.cabal.in
compiler/hsSyn/Convert.lhs
compiler/hsSyn/HsBinds.lhs
compiler/hsSyn/HsTypes.lhs
compiler/main/DynFlags.hs
compiler/parser/Lexer.x
compiler/parser/Parser.y.pp
compiler/parser/RdrHsSyn.lhs
compiler/prelude/PrelNames.lhs
compiler/typecheck/TcCanonical.lhs
compiler/typecheck/TcHsSyn.lhs
compiler/typecheck/TcHsType.lhs
compiler/typecheck/TcMType.lhs
compiler/typecheck/TcTypeNats.hs