PkLab.net adcdab394b Merge branch 'master' of git://github.com/Itseez/opencv into doc_videoio_enums ...

# Resolved Conflicts:
#	modules/videoio/include/opencv2/videoio.hpp

2016-06-28 16:40:30 +02:00

..

videoio

added support for OpenNI2 IR stream #4366

2016-06-27 10:04:59 -07:00

videoio.hpp

Merge branch 'master' of git://github.com/Itseez/opencv into doc_videoio_enums

2016-06-28 16:40:30 +02:00