Repository : ssh://[email protected]/ghc On branch : type-nats Link : http://ghc.haskell.org/trac/ghc/changeset/a3506674ab786535713b1e55d331ae0d73b1a8ac/ghc
>--------------------------------------------------------------- commit a3506674ab786535713b1e55d331ae0d73b1a8ac Merge: b7ea7df 1a71c4d Author: Iavor S. Diatchki <[email protected]> Date: Mon Sep 2 07:44:00 2013 -0700 Merge branch 'type-nats' of http://git.haskell.org/ghc into type-nats Conflicts: compiler/types/Coercion.lhs compiler/types/TypeRep.lhs >--------------------------------------------------------------- a3506674ab786535713b1e55d331ae0d73b1a8ac compiler/typecheck/TcTypeNats.hs | 13 ++++++++----- compiler/types/Type.lhs | 4 +++- 2 files changed, 11 insertions(+), 6 deletions(-) _______________________________________________ ghc-commits mailing list [email protected] http://www.haskell.org/mailman/listinfo/ghc-commits
