diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 02:43:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-23 02:43:40 +0200 |
| commit | 9e6d8c309f2763364ca2aaab801963a302bdfe82 (patch) | |
| tree | 54a3f19fd41fd8d15d9de51f5df1fad1e4382864 /tools/zmqshell.py | |
| parent | afbaf6b367e17b487864ac37fb42fed6c274c500 (diff) | |
| parent | ee9e966296d74ca3836be5b5adc839cfc73d8c98 (diff) | |
| download | ffmpeg-9e6d8c309f2763364ca2aaab801963a302bdfe82.tar.gz | |
Merge commit 'ee9e966296d74ca3836be5b5adc839cfc73d8c98' into release/2.2
* commit 'ee9e966296d74ca3836be5b5adc839cfc73d8c98':
Update Changelog for v10.4
Prepare for 10.4 Release
Conflicts:
Changelog
RELEASE
Not merged as these dont apply to FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools/zmqshell.py')
0 files changed, 0 insertions, 0 deletions