[FFmpeg-cvslog] Merge commit 'e6c175dfd51e4b0e6deeae72cd8a161b22af3492'
Michael Niedermayer
git at videolan.org
Fri Feb 14 14:39:09 CET 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Feb 14 14:23:50 2014 +0100| [c0c6f9aba5c4072d75a99daab02e1153bdb5b822] | committer: Michael Niedermayer
Merge commit 'e6c175dfd51e4b0e6deeae72cd8a161b22af3492'
* commit 'e6c175dfd51e4b0e6deeae72cd8a161b22af3492':
Doxyfile: Only set HTML_{HEADER|FOOTER|STYLESHEET} from doxy_wrapper.sh
Conflicts:
doc/Doxyfile
See: 7d0ca5b7e43676cc23834ccd19d40744f7328b77
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c0c6f9aba5c4072d75a99daab02e1153bdb5b822
---
More information about the ffmpeg-cvslog
mailing list