Alexander Alekhin cd2b188c9a Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-04-24 18:13:06 +03:00
..
doc/pics
include/opencv2	next: drop DISABLE_OPENCV_24_COMPATIBILITY	2018-04-10 18:09:53 +03:00
misc/java
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-04-24 18:13:06 +03:00
test	ts: refactor OpenCV tests	2018-02-03 19:39:47 +00:00
CMakeLists.txt	update CMakeList.txt	2018-02-05 16:23:52 +03:00