ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri Dec 5
23:49:56 2014 +0100| [a0d0799ea2a79c6b598541248fe24083265cf336] | committer:
Michael Niedermayer
Merge commit '1eec9bfc383f6dca29d83a2bfb45433dd66561c9'
* commit '1eec9bfc383f6dca29d83a2bfb45433dd66561c9':
APIchanges: mark the release 11 branch point
Conflicts:
doc/APIchanges
Not merged as the contents in our APIchanges differ and it could be confusing
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a0d0799ea2a79c6b598541248fe24083265cf336
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
