[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Sun Feb 16 02:30:52 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 16 02:24:52 2014 +0100| [bbd8fd0371a54688cf96dab31307dd5cb5da251d] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Prepare for 10_beta1 Release
Conflicts:
RELEASE
merge only for metadata
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bbd8fd0371a54688cf96dab31307dd5cb5da251d
---
More information about the ffmpeg-cvslog
mailing list