Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/cc1cc09dbd5625b6d1c05bb878b8ad1767cb9780

>---------------------------------------------------------------

commit cc1cc09dbd5625b6d1c05bb878b8ad1767cb9780
Merge: 0440d8a... 336a769...
Author: Ian Lynagh <[email protected]>
Date:   Thu Aug 23 17:05:13 2012 +0100

    Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc

 compiler/basicTypes/RdrName.lhs    |   21 +++----
 compiler/coreSyn/TrieMap.lhs       |  111 ++++++++++++++++++++++++++++++++----
 compiler/iface/MkIface.lhs         |    7 +-
 compiler/main/HscTypes.lhs         |    3 +-
 compiler/nativeGen/PPC/CodeGen.hs  |    8 +-
 compiler/rename/RnEnv.lhs          |    7 ++-
 compiler/rename/RnNames.lhs        |    5 +-
 compiler/specialise/Rules.lhs      |    7 ++-
 compiler/specialise/SpecConstr.lhs |    6 +-
 compiler/specialise/Specialise.lhs |   12 +++-
 compiler/typecheck/TcBinds.lhs     |   57 ++++++++++++++++--
 compiler/typecheck/TcCanonical.lhs |   12 ++--
 compiler/typecheck/TcEvidence.lhs  |   23 +++----
 compiler/typecheck/TcMType.lhs     |   34 +++++++++++-
 compiler/typecheck/TcSimplify.lhs  |   46 ++-------------
 15 files changed, 247 insertions(+), 112 deletions(-)



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to