diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-17 03:38:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-17 03:40:45 +0100 |
| commit | 0360dbefad8aa6c61e7544d7028a5a599eddbbc4 (patch) | |
| tree | ac3d6ff9bf6309da3db34ff351433386485711e7 /tests/test.conf | |
| parent | deaaacbc3f8dafceb58e4512eba137744b2df94f (diff) | |
| parent | deb650c692317ccc3e5359f5b100c98dc88c514f (diff) | |
| download | ffmpeg-0360dbefad8aa6c61e7544d7028a5a599eddbbc4.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.5' into release/0.5
* qatar/release/0.5:
Release notes and changelog for 0.5.10
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/test.conf')
0 files changed, 0 insertions, 0 deletions