Alexander Alekhin 8f4e5c2fb8 Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2018-11-26 15:37:45 +03:00
..
include/opencv2	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2018-11-26 15:37:45 +03:00
misc/python	Utilize CV_UNUSED macro	2018-09-07 20:33:52 +09:00
src	Merge pull request #12570 from alalek:drop_usrtype1	2018-09-19 13:55:26 +03:00
test	Merge pull request #11897 from Jakub-Golinowski:hpx_backend	2018-08-31 16:23:26 +03:00
CMakeLists.txt	Python support	2015-03-02 18:13:00 +03:00