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
6dfcbd80ad
5cae5a1def
4600b0619a

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

pull/272/head

James Almer 7 years ago

parent 42a9722a5c ed434be106

commit 070336b89b

Whitespace

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

Split View

Diff Options

Show Stats Download Patch File Download Diff File

Diff Content Not Available