Alexander Alekhin 808ba552c5 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-09-14 23:44:35 +00:00
..
doc/pics	squashed #823	2015-04-24 21:58:14 +02:00
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-08-20 19:30:18 +03:00
misc/java	java: disable highgui wrapped code	2018-01-13 02:12:39 +00:00
src	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-09-14 23:44:35 +00:00
test	Merge pull request #11897 from Jakub-Golinowski:hpx_backend	2018-08-31 16:23:26 +03:00
CMakeLists.txt	update CMakeList.txt	2018-02-05 16:23:52 +03:00