Merge branch 'master' of github.com:fpco/stackage

Conflicts:
	build-constraints.yaml
This commit is contained in:
Michael Snoyman 2015-07-03 19:07:27 +03:00
commit 63fab58652

View File

@ -1115,6 +1115,11 @@ packages:
"koral koral@mailoo.org @k0ral":
- timerep
"Kostiantyn Rybnikov <k-bx@k-bx.com> @k-bx":
- protocol-buffers
- protocol-buffers-descriptor
- hprotoc
"Rob O'Callahan ropoctl@gmail.com":
- pipes-fastx
- seqalign