Alexander Alekhin 2f4e38c831 Merge pull request #6283 from jlubawy:vfw-surface4-fix		2016-03-17 11:08:12 +00:00
..
include/opencv2	ximea new param	2016-02-17 11:18:49 +01:00
misc/java/test
perf
src	Merge pull request #6283 from jlubawy:vfw-surface4-fix	2016-03-17 11:08:12 +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