Alexander Alekhin 51e543050c Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-05-10 18:19:56 +03:00
..
include/opencv2	next: drop DISABLE_OPENCV_24_COMPATIBILITY	2018-04-10 18:09:53 +03:00
misc/java/test	Modified java wrapping mechanism	2015-03-02 18:12:30 +03:00
perf	ts: refactor OpenCV tests	2018-02-03 19:39:47 +00:00
src	next: drop HAVE_TEGRA_OPTIMIZATION/TADP	2018-04-10 18:09:54 +03:00
test	photo:ppc fix MergeRobertson test	2018-05-05 09:38:55 +00:00
CMakeLists.txt	suppress warning on Jetson TK1	2017-04-11 18:27:12 +09:00