[FFmpeg-cvslog] Merge commit 'f1f42cfc66804907d1df9231469e4296472bb0f5'

Michael Niedermayer git at videolan.org
Fri Feb 14 14:59:55 CET 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 14 14:52:50 2014 +0100| [2fd0b5bd60b3c5bcbb2a462f11c4e280dcd4785e] | committer: Michael Niedermayer

Merge commit 'f1f42cfc66804907d1df9231469e4296472bb0f5'

* commit 'f1f42cfc66804907d1df9231469e4296472bb0f5':
  build: Do not pass HTML snippets and stylesheet as input to Doxygen

Conflicts:
	doc/Makefile

See: 0f378d86321e4d14153a28d5e74c3ff0f99b1a20
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2fd0b5bd60b3c5bcbb2a462f11c4e280dcd4785e
---





More information about the ffmpeg-cvslog mailing list