Merge branch 'master' into ghc7.10
Conflicts:
build-constraints.yaml
commit2aa04fe65581fab655aa197f365a197258c7c114
authorMichael Snoyman <michael@snoyman.com>
dateThu 30 Apr 2015, 13:18 (11 years ago)
parent7e495dd45930de
build-constraints.yaml+2
@@ -778,8 +778,10 @@ packages:
778778
779779 "Leon Mergen leon@solatis.com @solatis":
780780 - base58string
781+ - bitcoin-block
781782 - bitcoin-script
782783 - bitcoin-tx
784+ - bitcoin-types
783785 - hexstring
784786 - network-attoparsec
785787 - network-anonymous-i2p