diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 12:29:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-10 12:29:05 +0100 |
| commit | ee2c1e6dd337aeda24bcd95b55e4fb6e0b4f3638 (patch) | |
| tree | d07cc8338f9ca916354078afd58a20c976146c00 | |
| parent | 2e99867a4e43ac2d344a0e9f73885f5c676e1164 (diff) | |
| parent | cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d (diff) | |
| download | ffmpeg-ee2c1e6dd337aeda24bcd95b55e4fb6e0b4f3638.tar.gz | |
Merge commit 'cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d'
* commit 'cca4742a5e663cfe4dbd71f01f0c0fb042fddc1d':
doc/APIchanges: mark the place where 9 was branched
Conflicts:
doc/APIchanges
Not merged, as "9" was not a FFmpeg release and not branched anywhere from our APIChanges list
Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions