[commit: process] encoding: Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/process into encoding (04b55a2)

[Max Bolingbroke]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/process

On branch  : encoding

http://hackage.haskell.org/trac/ghc/changeset/04b55a2ff9071e9f3c09a23f836c56d1aaf8c023

>---------------------------------------------------------------

commit 04b55a2ff9071e9f3c09a23f836c56d1aaf8c023
Merge: 4394d33... 3c44a88...
Author: Max Bolingbroke <batterseapower at hotmail.com>
Date:   Fri May 13 15:52:14 2011 +0100

    Merge branch 'master' of ssh://darcs.haskell.org/srv/darcs/packages/process into encoding
    
    Conflicts:
    	cbits/runProcess.c
    	include/runProcess.h

 System/Process.hs           |   43 ++++++++++++++++++++++++++++++++++++++++---
 System/Process/Internals.hs |   41 ++++++++++++++++++++++++++---------------
 cbits/runProcess.c          |   35 ++++++++++++++++++++++++-----------
 include/processFlags.h      |    8 ++++++++
 include/runProcess.h        |    8 +++++---
 process.cabal               |    5 ++++-
 tests/3994.hs               |   22 ++++++++++++++++++++++
 tests/3994.stdout           |    2 ++
 tests/all.T                 |    2 ++
 9 files changed, 133 insertions(+), 33 deletions(-)


Diff suppressed because of size. To see it, use:

    git show 04b55a2ff9071e9f3c09a23f836c56d1aaf8c023