Merge pull request #1330 from lenlen:plantuml
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 13 Sep 2013 10:31:01 +0000 (14:31 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 13 Sep 2013 10:31:01 +0000 (14:31 +0400)
commit160ab8415e3d727b7ed45a9ee5d2f632becda7cc
tree0f9821f34395594da7756fc6471b134f7b9d10a4
parentc511d5d6498820adb819018a0aca759d2f9a0f2b
parent5b2d557502e0fb3f539af9aefe12d2d9c813b962
Merge pull request #1330 from lenlen:plantuml
CMakeLists.txt
doc/conf.py