diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 03:56:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-18 03:56:09 +0100 |
| commit | fa1ca88cb6fcd36b39599c4f2608a774909c1645 (patch) | |
| tree | e40c02b714170f59e239a55d1a2bae9fd10be070 | |
| parent | 2b95572b10ec8188f7e4061046a0c66a8ebd8e85 (diff) | |
| parent | 4039f11ed82d84009b5146f0a563f33ced33e4db (diff) | |
| download | ffmpeg-fa1ca88cb6fcd36b39599c4f2608a774909c1645.tar.gz | |
Merge commit '4039f11ed82d84009b5146f0a563f33ced33e4db' into release/2.4
* commit '4039f11ed82d84009b5146f0a563f33ced33e4db':
Prepare for 11.2 Release
Conflicts:
RELEASE
Merge for metadata only as this is not correct for 2.4.*
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions