generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4dcd37f699
opencv/modules/videoio
History
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
..
doc Split highgui module to videoio and highgui 2014-07-14 23:16:47 +04:00
include/opencv2 Split highgui module to videoio and highgui 2014-07-14 23:16:47 +04:00
perf Split highgui module to videoio and highgui 2014-07-14 23:16:47 +04:00
src Merge remote-tracking branch 'origin/master' into Openni2Support 2014-07-20 14:28:10 +02:00
test Split highgui module to videoio and highgui 2014-07-14 23:16:47 +04:00
CMakeLists.txt Refresh code. Fix merge conflict 2014-07-14 23:30:50 +04:00