Commit 52066bdb authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'c74f8178'

* commit 'c74f8178':
  nuv: cosmetics: pretty-printing

Conflicts:
	libavformat/nuv.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d7b20bfb c74f8178
This diff is collapsed.
Markdown is supported
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