Merge branch 'master' into shake

This commit is contained in:
Michael Snoyman 2015-02-24 15:59:12 +02:00
commit 6bf083c817

View File

@ -379,6 +379,7 @@ packages:
- pipes - pipes
- pipes-parse - pipes-parse
- pipes-concurrency - pipes-concurrency
- pipes-safe
"Chris Allen <cma@bitemyapp.com>": "Chris Allen <cma@bitemyapp.com>":
- bloodhound - bloodhound
@ -713,6 +714,10 @@ packages:
- cabal-test-quickcheck - cabal-test-quickcheck
- http-media - http-media
"Greg V greg@unrelenting.technology @myfreeweb":
- gitson
- pcre-heavy
"Stackage upper bounds": "Stackage upper bounds":
# Force a specific version that's compatible with transformers 0.3 # Force a specific version that's compatible with transformers 0.3
@ -758,6 +763,7 @@ packages:
- rest-client < 0.5 - rest-client < 0.5
- rest-types < 1.13 - rest-types < 1.13
- rest-core < 0.35 - rest-core < 0.35
- rest-gen < 0.17
# Package flags are applied to individual packages, and override the values of # Package flags are applied to individual packages, and override the values of
# global-flags # global-flags