[FFmpeg-cvslog] Merge commit '4da3f410d176dd1a55d7cbe5d2e2ead342027f13'
Michael Niedermayer
git at videolan.org
Wed Nov 27 02:33:52 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov 27 02:26:03 2013 +0100| [6f24566f56b8ed0424a77aede46bb3ddf06a28c8] | committer: Michael Niedermayer
Merge commit '4da3f410d176dd1a55d7cbe5d2e2ead342027f13'
* commit '4da3f410d176dd1a55d7cbe5d2e2ead342027f13':
configure: Restore doc option to disable building the documentation
Conflicts:
configure
See: eff2edae562096c1e21e8c048392ffe8968181f2
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f24566f56b8ed0424a77aede46bb3ddf06a28c8
---
More information about the ffmpeg-cvslog
mailing list