Merge branch '0.2-stable'

Conflicts: snap-core.cabal
ozataman · Oct 25, 2010 · 8fadfa4 · 8fadfa4
2 parents 1eee1d0 + d174f8f
commit 8fadfa4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/snap-core.cabal b/snap-core.cabal
@@ -156,7 +156,7 @@ Library
     monads-fd,
     old-locale,
     old-time,
-    text >= 0.7.1 && <0.8,
+    text >= 0.10 && <0.11,
     time,
     transformers,
     unix-compat == 0.2.*,

diff --git a/test/snap-core-testsuite.cabal b/test/snap-core-testsuite.cabal
@@ -45,7 +45,7 @@ Executable testsuite
     test-framework >= 0.3.1 && <0.4,
     test-framework-hunit >= 0.2.5 && < 0.3,
     test-framework-quickcheck2 >= 0.2.6 && < 0.3,
-    text >= 0.7.1 && <0.8,
+    text >= 0.10 && <0.11,
     time,
     transformers,
     unix-compat == 0.2.*,