Merge commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 14:23:29 +0000 (15:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 14 Feb 2014 14:23:29 +0000 (15:23 +0100)
commit71052d85c16bd65fa1e3e01d9040f9a3925efd7a
tree00faaf22a36c15008159c08cc7343d72482b38a5
parentcbf09bb63f31f100761d607a1cef5141bdfa96fa
parent3a26ccbf0d9f806d067e76a3f484170abecb36b3
Merge commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3'

* commit '3a26ccbf0d9f806d067e76a3f484170abecb36b3':
  build: doxy: Include code examples in Doxygen documentation

Conflicts:
doc/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/Makefile
library.mak