Vadim Pisarevsky ae9f80c1a9 Merge pull request #7855 from logic1988:master		2016-12-19 13:45:51 +00:00
..
doc	Updated ml module interfaces and documentation	2015-02-17 11:46:14 +03:00
include/opencv2	Merge pull request #7371 from mshabunin:aruco-java-wrap	2016-10-01 15:38:59 +00:00
misc/python	Adding of user-defined type conversions for python bindings inside module directories	2016-08-16 13:10:17 +03:00
src	Merge pull request #7855 from logic1988:master	2016-12-19 13:45:51 +00:00
test	Add JSON support.	2016-08-11 00:53:15 +08:00
CMakeLists.txt	Add python and java support for ml module	2015-03-19 13:22:30 +03:00