Merge branch '1.1-stable'

Conflicts: benchmark/hashtable-benchmark.cabal hashtables.cabal
gregorycollins · Oct 1, 2013 · ae72cc2 · ae72cc2
2 parents f2cb4a9 + 13974e7
commit ae72cc2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/benchmark/hashtable-benchmark.cabal b/benchmark/hashtable-benchmark.cabal
@@ -33,7 +33,7 @@ Executable hashtable-benchmark
                      statistics           >= 0.8     && <0.11,
                      threads              >= 0.4     && <0.6,
                      unordered-containers >= 0.2     && <0.3,
-                     vector               >= 0.7     && <0.11,
+                     vector               >= 0.7     && <0.12,
                      vector-algorithms    >= 0.5     && <0.6
 
   if flag(chart)

diff --git a/hashtables.cabal b/hashtables.cabal
@@ -184,7 +184,7 @@ Library
   Build-depends:     base      >= 4   && <5,
                      hashable  >= 1.1 && <1.2 || >= 1.2.1 && <1.3,
                      primitive,
-                     vector    >= 0.7 && <0.11
+                     vector    >= 0.7 && <0.12
 
   if flag(portable)
     cpp-options: -DNO_C_SEARCH -DPORTABLE