diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-11 11:12:48 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-11 11:12:48 +0200 |
commit | 56090b5b80431bfd791dbe8cfd23c058214118da (patch) | |
tree | 01f65dd3c9dcb2369d04946f19215d7e2b8d3ead /doc/RELEASE_NOTES | |
parent | 15cee5e5628a80a51d1bb298c8b838ddefd75a88 (diff) | |
parent | 3865ba7b21aef5d60183719e238361ec8797ab5a (diff) | |
download | ffmpeg-56090b5b80431bfd791dbe8cfd23c058214118da.tar.gz |
Merge commit '3865ba7b21aef5d60183719e238361ec8797ab5a'
* commit '3865ba7b21aef5d60183719e238361ec8797ab5a':
iff: K&R formatting cosmetics
Conflicts:
libavcodec/iff.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/RELEASE_NOTES')
0 files changed, 0 insertions, 0 deletions