Repository : ssh://darcs.haskell.org//srv/darcs/packages/ghc-prim On branch : no-pred-ty
http://hackage.haskell.org/trac/ghc/changeset/c4be591c787a0fe95c453859b1d0f43d81c56e86 >--------------------------------------------------------------- commit c4be591c787a0fe95c453859b1d0f43d81c56e86 Merge: 0b7b026... 9cd14ba... Author: Max Bolingbroke <[email protected]> Date: Wed Aug 31 22:18:00 2011 +0100 Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/ghc-prim into no-pred-ty Conflicts: GHC/Types.hs GHC/Classes.hs | 2 - GHC/Debug.hs | 2 +- GHC/IntWord32.hs | 71 ------------------------------------------------------ GHC/Ordering.hs | 13 ---------- GHC/Tuple.hs | 4 +++ GHC/Types.hs | 6 ++++- GHC/Unit.hs | 19 -------------- cbits/popcnt.c | 24 +++++++++--------- ghc-prim.cabal | 3 -- 9 files changed, 22 insertions(+), 122 deletions(-) diff --cc GHC/Types.hs index bf6363b,3303cda..e1e7470 --- a/GHC/Types.hs +++ b/GHC/Types.hs @@@ -17,8 -17,8 +17,9 @@@ module GHC.Types ( Bool(..), Char(..), Int(..), - Float(..), Double(..), IO(..), + Float(..), Double(..), - Ordering(..), IO(..) ++ Ordering(..), IO(..), + IPBox(..) ) where import GHC.Prim _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
