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

Merge remote-tracking branch 'qatar/master' 


* qatar/master:
  golomb: K&R formatting cosmetics

Conflicts:
	libavcodec/golomb.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 4c18c314 2c993e8b
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 177 additions and 135 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