Luis Roberto Morales Iglesias 60b33046a7 [Issue #7290] Fixes OpenNI and OpenNI2 linking conflict		2016-09-15 17:13:04 +02:00
..
doc	Large update of videoio doc and samples following mshabunin comments	2016-09-09 18:46:11 +02:00
include/opencv2	Merge pull request #7181 from valeriyvan:ioscleanup	2016-09-14 17:04:59 +00:00
misc/java/test
perf
src	[Issue #7290] Fixes OpenNI and OpenNI2 linking conflict	2016-09-15 17:13:04 +02:00
test	test: ffmpeg: change resolution for H264 test	2016-07-21 00:20:18 +03:00
CMakeLists.txt	- removed whitespaces	2016-01-25 13:13:13 +01:00