Alexander Alekhin 332c37f332 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2019-03-06 11:43:16 +03:00
..
doc/pics	squashed #823	2015-04-24 21:58:14 +02:00
include/opencv2	removed C API in the following modules: photo, video, imgcodecs, videoio (#13060)	2018-11-09 00:52:09 +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	2019-03-06 11:43:16 +03:00
test	Restored 500ms delay in highgui test	2018-12-03 14:34:29 +03:00
CMakeLists.txt	highgui: drop obsolete Carbon API	2018-11-07 19:21:33 +03:00