Alexander Alekhin 808ba552c5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-09-14 23:44:35 +00:00
..
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-08-20 19:30:18 +03:00
misc/java/test	related moved enums	2018-08-27 00:43:04 +03:00
perf	Merge pull request #11897 from Jakub-Golinowski:hpx_backend	2018-08-31 16:23:26 +03:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-09-14 23:44:35 +00:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-09-07 12:40:27 +03:00
CMakeLists.txt	suppress warning on Jetson TK1	2017-04-11 18:27:12 +09:00