204 Commits

Author	SHA1	Message	Date
Lars Glud	1242a66119	Openni2 support	2014-07-20 15:04:11 +02:00
Lars Glud	4dcd37f699	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	2014-07-20 14:28:10 +02:00
VBystricky	ca307669d4	Refresh code. Fix merge conflict	2014-07-14 23:30:50 +04:00
vbystricky	d58f736935	Split highgui module to videoio and highgui	2014-07-14 23:16:47 +04:00