Resolve conflicts
authorRoman Leshchinskiy <rl@cse.unsw.edu.au>
Wed, 22 Apr 2009 03:39:22 +0000 (03:39 +0000)
committerRoman Leshchinskiy <rl@cse.unsw.edu.au>
Wed, 22 Apr 2009 03:39:22 +0000 (03:39 +0000)
commitb158e953da8f695e90b2c9b06a95b9b5ea4d582f
treec34e3f6bd03ce5417ecd8f0571dd5753be93dcfb
parentc4acd24e744420b95b9a49c686511092719af222
Resolve conflicts
dph-base/Data/Array/Parallel/Stream/Segmented.hs
dph-prim-interface/Data/Array/Parallel/Unlifted.hs
dph-prim-interface/interface/DPH_Header.h
dph-prim-interface/interface/DPH_Interface.h
dph-prim-par/Data/Array/Parallel/Unlifted.hs
dph-prim-par/Data/Array/Parallel/Unlifted/Parallel.hs
dph-prim-par/Data/Array/Parallel/Unlifted/Parallel/Segmented.hs
dph-prim-seq/Data/Array/Parallel/Unlifted.hs
dph-prim-seq/Data/Array/Parallel/Unlifted/Sequential/Segmented.hs
dph-prim-seq/Data/Array/Parallel/Unlifted/Sequential/Segmented/Combinators.hs