Merge commit 'e13a929314e4a9a09d3146648f876f162f46cc32'

Browse Source

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

Conflicts:
	libavcodec/xl.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer

2013-07-29 11:08:02 +02:00

parent 19da86f3ff e13a929314

commit 688331c51c

1 changed files with 20 additions and 20 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files