Alexander Alekhin 88a33a4e4f Merge pull request #6201 from paroj:gst_noconvert		2016-03-03 11:36:05 +00:00
..
include/opencv2	ximea new param	2016-02-17 11:18:49 +01: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	Merge pull request #6201 from paroj:gst_noconvert	2016-03-03 11:36:05 +00: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