diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 14:23:50 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-14 14:38:21 +0100 |
| commit | c0c6f9aba5c4072d75a99daab02e1153bdb5b822 (patch) | |
| tree | 9f4dc1975b178479797f29808492026a9d2dab4d /doc/Doxyfile | |
| parent | a062bee1c12721ab460e2adee5b50dc2bd25efef (diff) | |
| parent | e6c175dfd51e4b0e6deeae72cd8a161b22af3492 (diff) | |
| download | ffmpeg-c0c6f9aba5c4072d75a99daab02e1153bdb5b822.tar.gz | |
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@gmx.at>
Diffstat (limited to 'doc/Doxyfile')
| -rw-r--r-- | doc/Doxyfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/Doxyfile b/doc/Doxyfile index 6488aadd35..96327ff6e5 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -793,13 +793,13 @@ HTML_FILE_EXTENSION = .html # each generated HTML page. If it is left blank doxygen will generate a # standard header. -#HTML_HEADER = doc/doxy/header.html +HTML_HEADER = # The HTML_FOOTER tag can be used to specify a personal HTML footer for # each generated HTML page. If it is left blank doxygen will generate a # standard footer. -#HTML_FOOTER = doc/doxy/footer.html +HTML_FOOTER = # The HTML_STYLESHEET tag can be used to specify a user-defined cascading # style sheet that is used by each HTML page. It can be used to @@ -808,7 +808,7 @@ HTML_FILE_EXTENSION = .html # the style sheet file to the HTML output directory, so don't put your own # stylesheet in the HTML output directory as well, or it will be erased! -#HTML_STYLESHEET = doc/doxy/doxy_stylesheet.css +HTML_STYLESHEET = # The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. # Doxygen will adjust the colors in the stylesheet and background images |