Alexander Alekhin 808ba552c5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-09-14 23:44:35 +00:00
..
include/opencv2	superres: apply CV_OVERRIDE/CV_FINAL	2018-03-28 18:43:27 +03:00
perf	Merge pull request #11897 from Jakub-Golinowski:hpx_backend	2018-08-31 16:23:26 +03:00
src	Add semicolons after CV_INSTRUMENT macros	2018-09-14 06:45:31 +09:00
test	Merge pull request #11897 from Jakub-Golinowski:hpx_backend	2018-08-31 16:23:26 +03:00
CMakeLists.txt	suppress warnings from cuda	2017-04-05 08:30:16 +09:00