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

Merge commit '35384934' 


* commit '35384934':
  mov: cosmetics: reorder the list of tags

Conflicts:
	libavformat/mov.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 74622ad3 35384934
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 36 additions and 36 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