[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'
Michael Niedermayer
git at videolan.org
Thu Oct 31 13:43:01 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Oct 31 13:08:06 2013 +0100| [532ca12300f149a91090270ac733c52c4573ec88] | committer: Michael Niedermayer
Merge remote-tracking branch 'qatar/master'
* qatar/master:
build: Ensure that strip commands are run silently
Conflicts:
Makefile
Not merged as it conflicts with strip being on the BRIEF list
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=532ca12300f149a91090270ac733c52c4573ec88
---
More information about the ffmpeg-cvslog
mailing list