[commit: vector] simd: Resolve conflict (7259a8e)

[Geoffrey Mainland]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : simd

http://hackage.haskell.org/trac/ghc/changeset/7259a8ed39021fc9b997f8214bd44197bd5c482b

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

commit 7259a8ed39021fc9b997f8214bd44197bd5c482b
Author: Roman Leshchinskiy <rl at cse.unsw.edu.au>
Date:   Wed Oct 10 22:21:23 2012 +0000

    Resolve conflict

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

 benchmarks/vector-benchmarks.cabal |    4 ++--
 tests/vector-tests.cabal           |    6 +++---
 vector.cabal                       |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/benchmarks/vector-benchmarks.cabal b/benchmarks/vector-benchmarks.cabal
index 87ee6a4..3e825c0 100644
--- a/benchmarks/vector-benchmarks.cabal
+++ b/benchmarks/vector-benchmarks.cabal
@@ -1,5 +1,5 @@
 Name:           vector-benchmarks
-Version:        0.10
+Version:        0.10.9
 License:        BSD3
 License-File:   LICENSE
 Author:         Roman Leshchinskiy <rl at cse.unsw.edu.au>
@@ -14,7 +14,7 @@ Executable algorithms
   Build-Depends: base >= 2 && < 5, array,
                  criterion >= 0.5 && < 0.7,
                  mwc-random >= 0.5 && < 0.13,
-                 vector == 0.10
+                 vector == 0.10.9
 
   if impl(ghc<6.13)
     Ghc-Options: -finline-if-enough-args -fno-method-sharing
diff --git a/tests/vector-tests.cabal b/tests/vector-tests.cabal
index bc491ed..c56dc6b 100644
--- a/tests/vector-tests.cabal
+++ b/tests/vector-tests.cabal
@@ -1,5 +1,5 @@
 Name:           vector-tests
-Version:        0.10
+Version:        0.10.9
 License:        BSD3
 License-File:   LICENSE
 Author:         Max Bolingbroke, Roman Leshchinskiy
@@ -18,7 +18,7 @@ Build-Type:     Simple
 Executable "vector-tests-O0"
   Main-Is:  Main.hs
 
-  Build-Depends: base >= 4 && < 5, template-haskell, vector == 0.10,
+  Build-Depends: base >= 4 && < 5, template-haskell, vector == 0.10.9,
                  random,
                  QuickCheck >= 2, test-framework, test-framework-quickcheck2
 
@@ -38,7 +38,7 @@ Executable "vector-tests-O0"
 Executable "vector-tests-O2"
   Main-Is:  Main.hs
 
-  Build-Depends: base >= 4 && < 5, template-haskell, vector == 0.10,
+  Build-Depends: base >= 4 && < 5, template-haskell, vector == 0.10.9,
                  random,
                  QuickCheck >= 2, test-framework, test-framework-quickcheck2
 
diff --git a/vector.cabal b/vector.cabal
index b9bdc08..9af0ab6 100644
--- a/vector.cabal
+++ b/vector.cabal
@@ -1,5 +1,5 @@
 Name:           vector
-Version:        0.10
+Version:        0.10.9
 License:        BSD3
 License-File:   LICENSE
 Author:         Roman Leshchinskiy <rl at cse.unsw.edu.au>