Merge pull request #301 from emchristiansen:javasample2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 15 Feb 2013 14:38:24 +0000 (18:38 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 15 Feb 2013 14:38:25 +0000 (18:38 +0400)
commit7e5eee5bf1912e79c5b8e65ae454227bf745f4c3
tree50ab9c7df2085f5d11df5ee41fb5f559a637d4dd
parentf58dffe31fbb4cce44f85314ccafa092668a5ea4
parent2853bab471f7e2f8871de7b132c716972d0bde1e
Merge pull request #301 from emchristiansen:javasample2.4
doc/tutorials/introduction/table_of_content_introduction/table_of_content_introduction.rst