simonpj 2002/07/09 09:15:24 PDT
Modified files: (Branch: meta-haskell-branch)
ghc ANNOUNCE Makefile README VERSION
ghc/compiler/main DriverPhases.hs Main.hs
ghc/compiler/typecheck TcExpr.lhs
ghc/docs Makefile
ghc/docs/users_guide 5-04-notes.sgml Makefile installing.sgml
ghc/includes RtsAPI.h TSO.h
ghc/mk config.mk version.mk
ghc/rts Linker.c Makefile Prelude.h PrimOps.hc
Profiling.c RtsStartup.c Schedule.c
Signals.c rts.conf.in
ghc/utils/ghc-pkg Main.hs
libraries Makefile
libraries/GLUT Makefile
libraries/OpenGL Makefile
libraries/base Makefile Prelude.hs
libraries/base/Data Dynamic.hs Either.hs Maybe.hs
libraries/base/GHC Base.lhs Conc.lhs Float.lhs Handle.hs
IOBase.lhs Num.lhs Posix.hs Real.lhs
TopHandler.lhs
libraries/base/System Cmd.hs Directory.hs Environment.hs
Random.hs
libraries/base/cbits dirUtils.c
libraries/base/include HsBase.h
libraries/haskell98 Makefile
libraries/mk target.mk
libraries/network Makefile Network.hs
libraries/network/Network BSD.hsc CGI.hs Socket.hsc URI.hs
libraries/network/include HsNet.h
Added files: (Branch: meta-haskell-branch)
ghc/docs index.html
ghc/rts ThreadLabels.c ThreadLabels.h
libraries/base prologue.txt
libraries/haskell98 prologue.txt
libraries/network prologue.txt
Removed files: (Branch: meta-haskell-branch)
ghc/docs/set Makefile set.sgml
Log:
Merge up to meta-haskell-merge6
Revision Changes Path
1.38.2.1 +15 -79 fptools/ghc/ANNOUNCE
1.20.2.1 +1 -6 fptools/ghc/Makefile
1.31.2.1 +1 -1 fptools/ghc/README
1.7.8.1 +1 -1 fptools/ghc/VERSION
1.19.2.2 +0 -0 fptools/ghc/compiler/main/DriverPhases.hs
1.104.2.5 +1 -1 fptools/ghc/compiler/main/Main.hs
1.120.2.15 +2 -2 fptools/ghc/compiler/typecheck/TcExpr.lhs
1.7.18.1 +4 -5 fptools/ghc/docs/Makefile
1.3.4.2 +6 -3 fptools/ghc/docs/users_guide/5-04-notes.sgml
1.11.22.2 +0 -4 fptools/ghc/docs/users_guide/Makefile
1.54.2.2 +18 -151 fptools/ghc/docs/users_guide/installing.sgml
1.26.2.1 +13 -2 fptools/ghc/includes/RtsAPI.h
1.26.2.1 +1 -4 fptools/ghc/includes/TSO.h
1.17.2.1 +1 -2 fptools/ghc/mk/config.mk
1.22.2.1 +2 -2 fptools/ghc/mk/version.mk
1.88.2.4 +26 -8 fptools/ghc/rts/Linker.c
1.70.2.1 +5 -1 fptools/ghc/rts/Makefile
1.19.2.1 +5 -1 fptools/ghc/rts/Prelude.h
1.98.2.1 +5 -3 fptools/ghc/rts/PrimOps.hc
1.30.6.1 +13 -13 fptools/ghc/rts/Profiling.c
1.61.4.2 +5 -1 fptools/ghc/rts/RtsStartup.c
1.140.2.3 +12 -17 fptools/ghc/rts/Schedule.c
1.24.2.1 +13 -1 fptools/ghc/rts/Signals.c
1.6.2.1 +5 -0 fptools/ghc/rts/rts.conf.in
1.22.2.2 +6 -1 fptools/ghc/utils/ghc-pkg/Main.hs
1.4.2.5 +1 -1 fptools/libraries/Makefile
1.2.2.1 +19 -2 fptools/libraries/GLUT/Makefile
1.3.2.1 +4 -1 fptools/libraries/OpenGL/Makefile
1.24.2.4 +3 -2 fptools/libraries/base/Makefile
1.3.2.3 +34 -30 fptools/libraries/base/Prelude.hs
1.6.2.3 +4 -0 fptools/libraries/base/Data/Dynamic.hs
1.4.2.2 +10 -0 fptools/libraries/base/Data/Either.hs
1.4.2.2 +12 -1 fptools/libraries/base/Data/Maybe.hs
1.8.2.5 +33 -3 fptools/libraries/base/GHC/Base.lhs
1.4.2.3 +50 -8 fptools/libraries/base/GHC/Conc.lhs
1.5.2.3 +3 -0 fptools/libraries/base/GHC/Float.lhs
1.6.2.2 +8 -0 fptools/libraries/base/GHC/Handle.hs
1.8.2.3 +13 -0 fptools/libraries/base/GHC/IOBase.lhs
1.4.2.2 +1 -0 fptools/libraries/base/GHC/Num.lhs
1.6.2.3 +1 -1 fptools/libraries/base/GHC/Posix.hs
1.3.2.3 +4 -0 fptools/libraries/base/GHC/Real.lhs
1.6.2.2 +42 -22 fptools/libraries/base/GHC/TopHandler.lhs
1.3.2.2 +21 -12 fptools/libraries/base/System/Cmd.hs
1.3.2.2 +11 -8 fptools/libraries/base/System/Directory.hs
1.6.2.2 +9 -2 fptools/libraries/base/System/Environment.hs
1.4.2.2 +3 -1 fptools/libraries/base/System/Random.hs
1.3.2.1 +9 -0 fptools/libraries/base/cbits/dirUtils.c
1.7.2.1 +1 -1 fptools/libraries/base/include/HsBase.h
1.3.2.1 +5 -1 fptools/libraries/haskell98/Makefile
1.11.2.1 +6 -1 fptools/libraries/mk/target.mk
1.8.2.2 +9 -1 fptools/libraries/network/Makefile
1.3.2.2 +87 -22 fptools/libraries/network/Network.hs
1.3.2.2 +25 -18 fptools/libraries/network/Network/BSD.hsc
1.1.4.2 +1 -1 fptools/libraries/network/Network/CGI.hs
1.11.2.4 +77 -43 fptools/libraries/network/Network/Socket.hsc
1.1.4.2 +54 -22 fptools/libraries/network/Network/URI.hs
1.2.4.2 +1 -4 fptools/libraries/network/include/HsNet.h
_______________________________________________
Cvs-ghc mailing list
[EMAIL PROTECTED]
http://www.haskell.org/mailman/listinfo/cvs-ghc
