generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into merge-2.4

Browse Source 
Conflicts:
	doc/tutorials/definitions/tocDefinitions.rst
This commit is contained in:
Roman Donchenko
2013-10-01 17:37:05 +04:00
parent 81eb4bd8be 8717281e0e
commit 6133aeede8
17 changed files with 1443 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/tutorials/definitions/tocDefinitions.rst
View File

@@ -11,4 +11,5 @@
.. |Author_EricCh| unicode:: Eric U+0020 Christiansen
.. |Author_AndreyP| unicode:: Andrey U+0020 Pavlenko
.. |Author_AlexS| unicode:: Alexander U+0020 Smorkalov
.. |Author_BarisD| unicode:: Bar U+0131 U+015F U+0020 Evrim U+0020 Demir U+00F6 z
.. |Author_BarisD| unicode:: Bar U+0131 U+015F U+0020 Evrim U+0020 Demir U+00F6 z
.. |Author_DomenicoB| unicode:: Domenico U+0020 Daniele U+0020 Bloisi