Resolve conflict master
authorRoman Leshchinskiy <rl@cse.unsw.edu.au>
Wed, 10 Oct 2012 22:21:23 +0000 (22:21 +0000)
committerRoman Leshchinskiy <rl@cse.unsw.edu.au>
Wed, 10 Oct 2012 22:21:23 +0000 (22:21 +0000)
benchmarks/vector-benchmarks.cabal
tests/vector-tests.cabal
vector.cabal

index 87ee6a4..3e825c0 100644 (file)
@@ -1,5 +1,5 @@
 Name:           vector-benchmarks
 Name:           vector-benchmarks
-Version:        0.10
+Version:        0.10.9
 License:        BSD3
 License-File:   LICENSE
 Author:         Roman Leshchinskiy <rl@cse.unsw.edu.au>
 License:        BSD3
 License-File:   LICENSE
 Author:         Roman Leshchinskiy <rl@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,
   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
 
   if impl(ghc<6.13)
     Ghc-Options: -finline-if-enough-args -fno-method-sharing
index bc491ed..c56dc6b 100644 (file)
@@ -1,5 +1,5 @@
 Name:           vector-tests
 Name:           vector-tests
-Version:        0.10
+Version:        0.10.9
 License:        BSD3
 License-File:   LICENSE
 Author:         Max Bolingbroke, Roman Leshchinskiy
 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
 
 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
 
                  random,
                  QuickCheck >= 2, test-framework, test-framework-quickcheck2
 
@@ -38,7 +38,7 @@ Executable "vector-tests-O0"
 Executable "vector-tests-O2"
   Main-Is:  Main.hs
 
 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
 
                  random,
                  QuickCheck >= 2, test-framework, test-framework-quickcheck2
 
index b9bdc08..9af0ab6 100644 (file)
@@ -1,5 +1,5 @@
 Name:           vector
 Name:           vector
-Version:        0.10
+Version:        0.10.9
 License:        BSD3
 License-File:   LICENSE
 Author:         Roman Leshchinskiy <rl@cse.unsw.edu.au>
 License:        BSD3
 License-File:   LICENSE
 Author:         Roman Leshchinskiy <rl@cse.unsw.edu.au>