diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-30 20:12:45 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-30 20:13:20 +0200 |
| commit | 6135baa85bda0d8d5ecc3f742858424eb3daf75d (patch) | |
| tree | 2cb811d8debf9e510ce1fd346f813f3f6786dfcc /tools/normalize.py | |
| parent | 357325603719a1283a7375b6df9ddb7fafe203fe (diff) | |
| parent | 12bbd819cbdfdd2b41286c5ccabee7f5e5b6612a (diff) | |
| download | ffmpeg-6135baa85bda0d8d5ecc3f742858424eb3daf75d.tar.gz | |
Merge commit '12bbd819cbdfdd2b41286c5ccabee7f5e5b6612a' into release/2.2
* commit '12bbd819cbdfdd2b41286c5ccabee7f5e5b6612a':
Prepare for 10.3 Release
Conflicts:
RELEASE
Not merged, as FFmpeg has different version numbers
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/normalize.py')
0 files changed, 0 insertions, 0 deletions