diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-08 21:08:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-08 21:08:46 +0200 |
| commit | 4f85e7b6ecc351702184ddbab751bbb5773b53ed (patch) | |
| tree | e7c8f39b2b1a8c423ebd9134c18eda9de0a808a5 /tests/ffserver.conf | |
| parent | 10848d08625274e665c0ae3ad054e16732daf23c (diff) | |
| parent | 808686375d1c80b0eb1b12a78838a3ba010fce69 (diff) | |
| download | ffmpeg-4f85e7b6ecc351702184ddbab751bbb5773b53ed.tar.gz | |
Merge remote-tracking branch 'qatar/release/0.7' into release/0.8
* qatar/release/0.7:
Update changelog for 0.7.5 release
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ffserver.conf')
0 files changed, 0 insertions, 0 deletions