diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 14:19:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-21 14:19:46 +0200 |
| commit | 1fabe4ae8cc07d80c735bb45858f542bb0aea944 (patch) | |
| tree | 732bdb68e4a952772d4330284f8d5fe187ee4dce | |
| parent | 4ccde2d356e73430738380cb8b94575bdf707f9b (diff) | |
| parent | f1a2364cebe472a98a5ea157071f4eee4429ce9f (diff) | |
| download | ffmpeg-1fabe4ae8cc07d80c735bb45858f542bb0aea944.tar.gz | |
Merge commit 'f1a2364cebe472a98a5ea157071f4eee4429ce9f' into release/1.1
* commit 'f1a2364cebe472a98a5ea157071f4eee4429ce9f':
Update Changelog for 9.12
Conflicts:
Changelog
Not merged, as the changelog does not apply to FFmpeg like this
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions