MYLS 3935855365 Merge remote-tracking branch 'refs/remotes/opencv/master' into FileStorageBase64DocsTests ... # Conflicts: # modules/core/test/test_io.cpp		2016-07-30 01:08:27 +08:00
..
doc	Updated ml module interfaces and documentation	2015-02-17 11:46:14 +03:00
include/opencv2	Adding support for pointer generation. Fixes #6605	2016-05-31 08:35:50 +02:00
src	Merge pull request #6860 from IshankGulati:svm-error-message	2016-07-18 15:44:40 +00:00
test	Modify Base64 functions and add test and documentation	2016-07-19 15:54:38 +08:00
CMakeLists.txt	Add python and java support for ml module	2015-03-19 13:22:30 +03:00