diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 21:03:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-18 21:03:54 +0200 |
| commit | a6ba5184a5e2a224f4f62bbb736b68dc416120fe (patch) | |
| tree | c9292aa0f3e080d912b2dce77c369cfe2de7a4a4 | |
| parent | 6eefc578a5c439fc8df3733533236eb5189f2de1 (diff) | |
| parent | 968a62a9d9e3a785ce1f79b80facfe09c6c14544 (diff) | |
| download | ffmpeg-a6ba5184a5e2a224f4f62bbb736b68dc416120fe.tar.gz | |
Merge commit '968a62a9d9e3a785ce1f79b80facfe09c6c14544'
* commit '968a62a9d9e3a785ce1f79b80facfe09c6c14544':
doc/APIchanges: mark the release 10 branch point
Conflicts:
doc/APIchanges
Not merged, as there was no such branch in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions