Merge commit 'f1f42cfc66804907d1df9231469e4296472bb0f5'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 13:52:50 +0000 (14:52 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 13:53:54 +0000 (14:53 +0100)
commit2fd0b5bd60b3c5bcbb2a462f11c4e280dcd4785e
tree9e6135cdcc48638e86889735fa41a272e3f83921
parentc0c6f9aba5c4072d75a99daab02e1153bdb5b822
parentf1f42cfc66804907d1df9231469e4296472bb0f5
Merge commit 'f1f42cfc66804907d1df9231469e4296472bb0f5'

* commit 'f1f42cfc66804907d1df9231469e4296472bb0f5':
  build: Do not pass HTML snippets and stylesheet as input to Doxygen

Conflicts:
doc/Makefile

See: 0f378d86321e4d14153a28d5e74c3ff0f99b1a20
Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/Makefile