[FFmpeg-cvslog] Merge commit '12f0388f9cb32016ac0dacaeca631b088b29bb96'
Michael Niedermayer
git at videolan.org
Thu Sep 4 20:46:34 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 4 20:20:02 2014 +0200| [69a68d301345a89a27479f2a6093fc4624804049] | committer: Michael Niedermayer
Merge commit '12f0388f9cb32016ac0dacaeca631b088b29bb96'
* commit '12f0388f9cb32016ac0dacaeca631b088b29bb96':
Add release notes for 11.
Conflicts:
doc/RELEASE_NOTES
Mostly not merged
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=69a68d301345a89a27479f2a6093fc4624804049
---
More information about the ffmpeg-cvslog
mailing list