Permalink
Browse files

Merge branch 'master' into 2.9.0

Conflicts:
	data-lens.cabal
  • Loading branch information...
2 parents 80efbf6 + d7a83a3 commit 5caf28d9819eabe192c5a0b01eedb3dcc4e15e30 @roconnor committed Apr 9, 2012
Showing with 9 additions and 9 deletions.
  1. +9 −9 data-lens.cabal
View
@@ -23,15 +23,15 @@ flag DeriveDataTypeable
default: True
library
- build-depends:
+ build-depends:
base >= 4 && < 5,
- comonad >= 1.1 && < 1.2,
- comonad-transformers >= 2.0 && < 2.1,
- containers >= 0.3 && < 0.5,
- contravariant >= 0.1.2 && < 0.2,
- distributive >= 0.2 && < 0.3,
- semigroupoids >= 1.2.4 && < 1.3,
- transformers >= 0.2.0 && <= 0.3
+ comonad >= 1.1.1.3 && < 1.2,
+ comonad-transformers >= 2.1 && < 2.2,
+ containers >= 0.3 && < 0.5,
+ contravariant >= 0.2.0.1 && < 0.3,
+ distributive >= 0.2.1 && < 0.3,
+ semigroupoids >= 1.2.4 && < 1.4,
+ transformers >= 0.2.0 && < 0.4
if flag(DeriveDataTypeable)
extensions: DeriveDataTypeable
@@ -48,7 +48,7 @@ library
-- Data.Lens.Partial.Strict
Control.Category.Product
- ghc-options: -Wall
+ ghc-options: -Wall
hs-source-dirs:
src

0 comments on commit 5caf28d

Please sign in to comment.