Alexander Alekhin 639c8fc6d6 Merge pull request #5870 from IshankGulati:VideoCapture-fix		2016-06-30 13:20:51 +00:00
..
include/opencv2	added support for OpenNI2 IR stream #4366	2016-06-27 10:04:59 -07: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 #5870 from IshankGulati:VideoCapture-fix	2016-06-30 13:20:51 +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