chak 2002/07/11 02:10:58 PDT
Modified files: (Branch: ghc-ndp-branch2b)
ghc/compiler/main CmdLineOpts.lhs
ghc/compiler/ndpFlatten FlattenMonad.hs TODO
ghc/compiler/prelude PrimOp.lhs
Log:
Fixes merge-related problems.
Revision Changes Path
1.167.4.2 +1 -1 fptools/ghc/compiler/main/CmdLineOpts.lhs
1.3.6.2 +6 -6 fptools/ghc/compiler/ndpFlatten/FlattenMonad.hs
1.2.10.2 +1 -0 fptools/ghc/compiler/ndpFlatten/TODO
1.102.6.1 +5 -1 fptools/ghc/compiler/prelude/PrimOp.lhs
_______________________________________________
Cvs-ghc mailing list
[EMAIL PROTECTED]
http://www.haskell.org/mailman/listinfo/cvs-ghc