Merge commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Nov 2012 13:07:51 +0000 (14:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 Nov 2012 13:07:51 +0000 (14:07 +0100)
commit52066bdb300b3a2cdef48897d0c864410b259084
treeb68ed4c51fd623eb36912ce58555c1813e7e3514
parentd7b20bfbb582c369518c73720fb4b0266714cde6
parentc74f81786d434dfaf9b3dff06aa96bfd23d0127b
Merge commit 'c74f81786d434dfaf9b3dff06aa96bfd23d0127b'

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

Conflicts:
libavformat/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/nuv.c