Merge branch 'master' into type-nats
authorIavor S. Diatchki <diatchki@galois.com>
Mon, 20 Jun 2011 17:31:59 +0000 (10:31 -0700)
committerIavor S. Diatchki <diatchki@galois.com>
Mon, 20 Jun 2011 17:31:59 +0000 (10:31 -0700)
commit0b1149441b75bcdaa59382f91900cd7b6d76aa84
treecb7d5e3e65c6943b71d1108eb26ebc2890e0cdc2
parent1420296489645dcb7f0af48ba145788c4201a7e0
parent089cc2928c8c0e8107448e62b29b6392a1abe30f
Merge branch 'master' into type-nats

Conflicts:
compiler/main/DynFlags.hs
compiler/parser/Lexer.x
compiler/iface/BinIface.hs
compiler/iface/IfaceSyn.lhs
compiler/iface/TcIface.lhs
compiler/main/DynFlags.hs
compiler/parser/Lexer.x
compiler/parser/Parser.y.pp
compiler/typecheck/TcErrors.lhs
compiler/typecheck/TcSMonad.lhs
compiler/typecheck/TcSplice.lhs