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 /common.mak | |
| 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 'common.mak')
0 files changed, 0 insertions, 0 deletions