Merge /Users/benl/devel/dph/dph-head-devel
authorBen Lippmeier <benl@ouroborus.net>
Thu, 17 Nov 2011 02:35:13 +0000 (13:35 +1100)
committerBen Lippmeier <benl@ouroborus.net>
Thu, 17 Nov 2011 02:35:13 +0000 (13:35 +1100)
Conflicts:
dph-lifted-copy/Data/Array/Parallel/PArray/PDataInstances.hs

1  2 
dph-lifted-copy/Data/Array/Parallel/PArray/PDataInstances.hs
dph-lifted-copy/Data/Array/Parallel/Prim.hs

@@@ -5,8 -5,8 +5,7 @@@
  
  -- | Instances for the PData class
  module Data.Array.Parallel.PArray.PDataInstances(
-   PData(..), PDatas(..),
 -  PData(..), Sels2,
--
++  PData(..), PDatas(..), Sels2,
    pvoid,
    punit,