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)
commit432546e4c48d6c848333257d5bac000832c4b254
tree64ed2185e932bb2750c249132d2462e807467801
parent700a388173e9d65b3cf649e4778551968666c27a
parent4d12beb7232cbb2e45f132c680217a1410d584b4
Merge pull request #3512 from vins31:OpenNi2_AsusXtion
modules/videoio/include/opencv2/videoio.hpp
modules/videoio/src/cap_openni2.cpp