third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d64f05cd59
opencv/modules/highgui/include/opencv2/highgui
History
Roman Donchenko 3c4b24d531 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	CMakeLists.txt
	modules/highgui/src/cap.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/color.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/imgproc.cpp
	samples/ocl/facedetect.cpp
2013-12-23 18:50:17 +04:00
..
cap_ios.h Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-06-25 15:55:52 +04:00
highgui_c.h Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-23 18:50:17 +04:00
highgui.hpp War on Whitespace, master edition: file endings. 2013-08-27 14:23:26 +04:00
ios.h Normalized file endings. 2013-08-21 18:59:25 +04:00