Repository : ssh://darcs.haskell.org//srv/darcs/packages/base On branch : encoding
http://hackage.haskell.org/trac/ghc/changeset/e13d56462d914c187564634dcfd7b10f52d1d382 >--------------------------------------------------------------- commit e13d56462d914c187564634dcfd7b10f52d1d382 Merge: e65910c... dc3ea0d... Author: Max Bolingbroke <[email protected]> Date: Mon May 9 18:26:29 2011 +0100 Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/base into encoding Conflicts: base.cabal Control/Concurrent/Chan.hs | 3 + Control/Concurrent/QSem.hs | 3 + Control/Concurrent/QSemN.hs | 3 + Control/Concurrent/SampleVar.hs | 3 + Control/Exception/Base.hs | 3 + Control/Monad/Group.hs | 33 +++++++ Control/Monad/Zip.hs | 46 +++++++++ Control/OldException.hs | 3 + Data/Complex.hs | 3 + Data/Dynamic.hs | 3 + Data/Either.hs | 3 + Data/Traversable.hs | 5 +- Data/Typeable.hs | 32 ++++++- Foreign/C/Types.hs | 5 +- Foreign/Ptr.hs | 3 + GHC/Conc/Sync.lhs | 1 + GHC/Event.hs | 2 + GHC/Event/Thread.hs | 19 +++- GHC/Float.lhs | 147 +++++++++++++++++++++++++---- GHC/Float/ConversionUtils.hs | 96 +++++++++++++++++++ GHC/ForeignPtr.hs | 1 + GHC/IO/FD.hs | 10 ++- GHC/Int.hs | 197 ++++++++++++++++++++++++++++++++------- GHC/Real.lhs | 18 +++- GHC/Weak.lhs | 2 + System/Mem/StableName.hs | 1 + System/Posix/Internals.hs | 1 - System/Posix/Types.hs | 4 +- System/Timeout.hs | 3 + base.cabal | 3 + include/Typeable.h | 52 +++-------- 31 files changed, 594 insertions(+), 114 deletions(-) diff --cc base.cabal index e650bec,5478cc3..6bb96f6 --- a/base.cabal +++ b/base.cabal @@@ -53,7 -53,7 +53,8 @@@ Library GHC.Exts, GHC.Float, GHC.Float.RealFracMethods, + GHC.Foreign, + GHC.Float.ConversionUtils, GHC.ForeignPtr, GHC.MVar, GHC.IO, _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
