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)
commitcbf09bb63f31f100761d607a1cef5141bdfa96fa
treedcafb5a9c48e07c8b5ddc7b8f2c75b476f5ef4c4
parent2fd0b5bd60b3c5bcbb2a462f11c4e280dcd4785e
parent19d3127867f001d007f98bc8c5a85c5409abf788
Merge commit '19d3127867f001d007f98bc8c5a85c5409abf788'

* 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>
doc/doxy-wrapper.sh