Repository : ssh://darcs.haskell.org//srv/darcs/packages/base On branch : ghc-generics1
http://hackage.haskell.org/trac/ghc/changeset/16db00bce7e60dd8fc5930eda68bd44b67f66e2b >--------------------------------------------------------------- commit 16db00bce7e60dd8fc5930eda68bd44b67f66e2b Merge: 0e1129d... 28670dd... Author: Jose Pedro Magalhaes <[email protected]> Date: Tue Jun 5 20:50:19 2012 +0100 Merge branch 'master' into ghc-generics1 Conflicts: base.cabal Data/Unique.hs | 22 +++-- Foreign/C/Error.hs | 2 +- Foreign/Marshal/Error.hs | 2 +- GHC/Conc/Sync.lhs | 7 +- GHC/Conc/Windows.hs | 28 ++++-- GHC/Environment.hs | 14 ++- GHC/GHCi.hs | 44 +++++++++ GHC/IO/Encoding/CodePage.hs | 14 +++- GHC/IO/FD.hs | 77 +++++++++------- GHC/TypeLits.hs | 98 ++++++++++++++------ GHC/Weak.lhs | 2 +- System/CPUTime.hsc | 15 +++- System/Environment.hs | 21 +++- System/Posix/Types.hs | 2 +- base.cabal | 1 + cbits/Win32Utils.c | 47 ++-------- include/HsBase.h | 6 +- tests/Concurrent/ThreadDelay001.hs | 10 ++- .../IO/countReaders001.stdout-i386-unknown-mingw32 | 1 - tests/IO/hFileSize001.stdout-mingw | 1 - tests/IO/hSeek004.stdout-mingw | 5 - tests/IO/openFile003.stdout-mingw | 16 --- ...-unknown-mingw32 => openFile003.stdout-mingw32} | 0 tests/IO/openFile005.stdout-i386-unknown-mingw32 | 12 --- tests/IO/openFile007.stdout-i386-unknown-mingw32 | 2 - tests/IO/readFile001.stdout-i386-unknown-mingw32 | 30 ------ tests/System/all.T | 2 +- 27 files changed, 267 insertions(+), 214 deletions(-) diff --cc base.cabal index 77cf566,ea553d2..136c938 --- a/base.cabal +++ b/base.cabal @@@ -58,7 -58,7 +58,8 @@@ Library GHC.Float.RealFracMethods, GHC.Foreign, GHC.ForeignPtr, + GHC.Generics, + GHC.GHCi, GHC.Handle, GHC.IO, GHC.IO.Buffer, _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
