Skip to content
Snippets Groups Projects
Commit 21e40f00 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '876d441f' 


* commit '876d441f':
  configure: don't enable tls protocols if network is disabled

Conflicts:
	configure

See: 7fc6545d
Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 12a83bc0 876d441f
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 3 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment