]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6eefc57 968a62a)
Merge commit '968a62a9d9e3a785ce1f79b80facfe09c6c14544'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 19:03:54 +0000 (21:03 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 May 2014 19:03:54 +0000 (21:03 +0200)
* 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>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.