Merge commit 'e6c175dfd51e4b0e6deeae72cd8a161b22af3492'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 13:23:50 +0000 (14:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 13:38:21 +0000 (14:38 +0100)
* 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>
1  2 
doc/Doxyfile

diff --cc doc/Doxyfile
Simple merge