diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 13:28:40 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-09 13:28:40 +0100 |
| commit | 1177e047f1661d902fa2f6db32218199f41fdd89 (patch) | |
| tree | 55d5c77d89df24c85766cf7ac82c3c2b71f9b30e | |
| parent | 66342aab73168f590ff32e343d4c1a4a1c9a0025 (diff) | |
| parent | 8ae0d702a1ba1c3c8d88a29c181f8434f25bf53c (diff) | |
| download | ffmpeg-1177e047f1661d902fa2f6db32218199f41fdd89.tar.gz | |
Merge commit '8ae0d702a1ba1c3c8d88a29c181f8434f25bf53c' into release/2.2
* commit '8ae0d702a1ba1c3c8d88a29c181f8434f25bf53c':
doc: More changelog updates for v10.6
Conflicts:
Changelog
not merged
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions