Merge pull request #3512 from vins31:OpenNi2_AsusXtion
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Dec 2014 10:39:42 +0000 (10:39 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 22 Dec 2014 10:39:42 +0000 (10:39 +0000)
1  2 
modules/videoio/include/opencv2/videoio.hpp
modules/videoio/src/cap_openni2.cpp

Simple merge