Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : encoding
http://hackage.haskell.org/trac/ghc/changeset/d319068b8556f76f180aa069abbf31ea681044c2 >--------------------------------------------------------------- commit d319068b8556f76f180aa069abbf31ea681044c2 Merge: 3159843... 2da1e48... Author: Max Bolingbroke <[email protected]> Date: Mon May 9 18:32:35 2011 +0100 Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/Cabal into encoding Conflicts: Distribution/Simple/Build/PathsModule.hs Distribution/PackageDescription/Parse.hs | 52 +++++++++++++++++++++++++---- Distribution/Simple/Build/PathsModule.hs | 9 ++--- Distribution/Simple/InstallDirs.hs | 28 ++++++++------- Distribution/Simple/PreProcess.hs | 4 ++- Distribution/Simple/SrcDist.hs | 22 ++++++++++++- Distribution/Simple/Test.hs | 13 +++++-- doc/developing-packages.markdown | 8 ++++ doc/index.markdown | 1 + 8 files changed, 105 insertions(+), 32 deletions(-) _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
