Alexander Alekhin 7d4bb9428b Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-08-20 19:30:18 +03:00
..
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-08-20 19:30:18 +03:00
misc/java	Refactor OpenCV Java Wrapping	2017-06-15 20:35:12 +04:00
perf	ts: refactor OpenCV tests	2018-02-03 19:39:47 +00:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-07-09 19:44:51 +03:00
test	fix test error on Tinker Board (OpenCL on Arm platform)	2018-02-26 22:55:06 +09:00
CMakeLists.txt	Merge pull request #9466 from huningxin:js	2017-09-25 16:52:07 +03:00