Merge remote-tracking branch 'origin/master' into Openni2Support
authorLars Glud <larshg@gmail.com>
Sun, 20 Jul 2014 12:28:10 +0000 (14:28 +0200)
committerLars Glud <larshg@gmail.com>
Sun, 20 Jul 2014 12:28:10 +0000 (14:28 +0200)
commit4dcd37f69919c070d4bc22439be065ff3a5e1ac1
tree32c347c2f3031db492529202f9029c3a4ea1232c
parent8b32235854c7a724fd5b0eafcb9e388e3c36b77d
parent9a58b1a3a0d60561daf8a4f1510324a04f286f68
Merge remote-tracking branch 'origin/master' into Openni2Support

Conflicts:
modules/highgui/CMakeLists.txt
modules/highgui/include/opencv2/highgui.hpp
modules/highgui/include/opencv2/highgui/highgui_c.h
CMakeLists.txt
cmake/OpenCVFindLibsVideo.cmake
modules/highgui/CMakeLists.txt
modules/highgui/include/opencv2/highgui.hpp
modules/highgui/include/opencv2/highgui/highgui_c.h
modules/videoio/src/cap.cpp