Merge commit 'c74f8178'
* commit 'c74f8178': nuv: cosmetics: pretty-printing Conflicts: libavformat/nuv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Showing
This diff is collapsed.
Please
register
or
sign in
to comment
* commit 'c74f8178': nuv: cosmetics: pretty-printing Conflicts: libavformat/nuv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>