Vadim Pisarevsky 9e6ef99422 Merge pull request #9850 from klchang:master		2017-10-27 11:22:28 +00:00
..
doc/pics	squashed #823	2015-04-24 21:58:14 +02:00
include/opencv2	Merge pull request #9445 from adishavit:master	2017-08-25 11:37:50 +00:00
misc/java	OpenCV Java Highgui Class	2017-07-01 11:07:20 +01:00
src	Merge pull request #9850 from klchang:master	2017-10-27 11:22:28 +00:00
test	fix modules deps	2016-08-25 14:57:12 +03:00
CMakeLists.txt	qt: fix non-world builds	2017-10-09 22:23:05 +03:00