Merge commit 'ed434be106a4615e0419b3ac7664220741afda2d'

Browse Source

* commit 'ed434be106a4615e0419b3ac7664220741afda2d':
  configure: Bail out if both GnuTLS and OpenSSL are enabled
  configure: Move x86 assembler sanity check into assembler probe function
  build: Add missing zlib dependencies for several protocols

This commit is a noop, see
6dfcbd80ad446ff163b47f2bf432bbf706436ea8
5cae5a1defa360da076365a786093a749d1ddf4e
4600b0619afc58b58de1a21d7a2c472e0d788282

Merged-by: James Almer <jamrial@gmail.com>

...

This commit is contained in:

James Almer 2017-11-01 18:45:23 -03:00

parent 42a9722a5c ed434be106

commit 070336b89b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available