diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-16 02:24:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-16 02:24:52 +0100 |
| commit | bbd8fd0371a54688cf96dab31307dd5cb5da251d (patch) | |
| tree | fe8223c22f7617eb782d2e31918164937d32fe33 /doc/ffmpeg-formats.texi | |
| parent | 1db87da35141c34474644c677bad2cf3a408611d (diff) | |
| parent | f58dcfb32e0f61711cd2a0e36458262ee925a17f (diff) | |
| download | ffmpeg-bbd8fd0371a54688cf96dab31307dd5cb5da251d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Prepare for 10_beta1 Release
Conflicts:
RELEASE
merge only for metadata
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffmpeg-formats.texi')
0 files changed, 0 insertions, 0 deletions