Merge commit 'e13a929314e4a9a09d3146648f876f162f46cc32'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 09:08:02 +0000 (11:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 29 Jul 2013 09:08:02 +0000 (11:08 +0200)
commit688331c51ce649b9c884dab620d097a54e4aa3e3
tree66382ea0ed5e167148521463665930c5548c0d32
parent19da86f3ff433913938807e49fc6caa0f9f927b2
parente13a929314e4a9a09d3146648f876f162f46cc32
Merge commit 'e13a929314e4a9a09d3146648f876f162f46cc32'

* commit 'e13a929314e4a9a09d3146648f876f162f46cc32':
  xl: K&R formatting cosmetics

Conflicts:
libavcodec/xl.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/xl.c