[commit: base] ghc-kinds: Merge branch 'master' into ghc-kinds (ce4cb2e)

Wed Oct 5 11:27:34 CEST 2011

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : ghc-kinds

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

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

commit ce4cb2ef0f421428f6c707ec5bfd5d5f0dc44921
Merge: 04bdf55... 252d878...
Author: Julien Cretin <ghc at ia0.eu>
Date:   Fri Sep 23 11:46:15 2011 +0200

    Merge branch 'master' into ghc-kinds

 GHC/Enum.lhs     |  111 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 GHC/Num.lhs      |   76 -------------------------------------
 GHC/Real.lhs     |    4 +-
 GHC/Word.hs      |   40 ++++---------------
 Text/Read/Lex.hs |   44 ++++++++++++---------
 5 files changed, 146 insertions(+), 129 deletions(-)