Merge branch 'master' into ghc7.10
Conflicts:
build-constraints.yaml
commit2c2d5cbd6999491f18e74063c7439e11320fd0fe
authorMichael Snoyman <michael@snoyman.com>
dateFri 1 May 2015, 08:02 (11 years ago)
parentaf49d1f5602aeb
build-constraints.yaml−3
@@ -958,9 +958,6 @@ packages:
958958 # https://github.com/fpco/stackage/issues/517
959959 - generic-deriving < 1.7
960960
961− # https://github.com/fpco/stackage/issues/531
962− - sbv < 4.3
963−
964961 # https://github.com/fpco/stackage/issues/537
965962 - zlib < 0.6
966963