Merge commit '19d3127867f001d007f98bc8c5a85c5409abf788'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 14:12:32 +0000 (15:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 14:12:32 +0000 (15:12 +0100)
* commit '19d3127867f001d007f98bc8c5a85c5409abf788':
  doxygen: Set EXAMPLE_PATH from within doxy-wrapper.sh

Conflicts:
doc/Doxyfile
doc/doxy-wrapper.sh

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
doc/doxy-wrapper.sh

index a6c54dd,e1b8363..da464bc
mode 100755,100755..100644
@@@ -8,4 -8,8 +8,5 @@@ shift 
  doxygen - <<EOF
  @INCLUDE        = ${DOXYFILE}
  INPUT           = $@
 -HTML_HEADER     = ${SRC_PATH}/doc/doxy/header.html
 -HTML_FOOTER     = ${SRC_PATH}/doc/doxy/footer.html
 -HTML_STYLESHEET = ${SRC_PATH}/doc/doxy/doxy_stylesheet.css
+ EXAMPLE_PATH    = ${SRC_PATH}/
  EOF