Merge branch 'master' into ghc7.10

Conflicts:
	build-constraints.yaml
This commit is contained in:
Michael Snoyman 2015-05-01 08:02:05 +03:00
commit 2c2d5cbd69

View File

@ -958,9 +958,6 @@ packages:
# https://github.com/fpco/stackage/issues/517
- generic-deriving < 1.7
# https://github.com/fpco/stackage/issues/531
- sbv < 4.3
# https://github.com/fpco/stackage/issues/537
- zlib < 0.6