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)
* commit 'e13a929314e4a9a09d3146648f876f162f46cc32':
  xl: K&R formatting cosmetics

Conflicts:
libavcodec/xl.c

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

diff --cc libavcodec/xl.c
Simple merge