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

Merge commit '65166329' 


* commit '65166329':
  tests: Only run noproxy test if networking is enabled
  fifo: K&R formatting cosmetics

Conflicts:
	libavformat/Makefile
	libavutil/fifo.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 2adf8a9c 65166329
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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