Alexander Alekhin f3494647c5 Merge pull request #6762 from maff91:master		2016-07-14 16:17:03 +00:00
..
include/opencv2	Merge branch 'master' of git://github.com/Itseez/opencv into doc_videoio_enums	2016-06-28 16:40:30 +02:00
misc/java/test	Updated Manager for Android	2015-06-02 17:33:04 +03:00
perf	Split highgui module to videoio and highgui	2014-07-14 23:16:47 +04:00
src	Fix bug #6682 (Can't change resolution for YUY2 camera with DShow)	2016-07-02 18:10:04 +03:00
test	Merge 2.4 into master	2015-12-08 10:24:54 +03:00
CMakeLists.txt	- removed whitespaces	2016-01-25 13:13:13 +01:00