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

Merge commit 'ce2e858f' 


* commit 'ce2e858f':
  http: K&R formatting cosmetics

Conflicts:
	libavformat/http.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents ab0f78ea ce2e858f
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 115 additions and 109 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