mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 12:10:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3c4b24d531
opencv/modules/imgproc
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
..
doc added cv::intergal to T-API 2013-12-06 13:18:25 +04:00
include/opencv2 fixed various warnings from the “doc” and other builders 2013-12-19 16:31:30 +04:00
perf hopefully, the last test failures are fixed now 2013-10-24 23:31:00 +04:00
src Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-23 18:50:17 +04:00
test Added ocl::pyrUp to T-API 2013-12-19 17:21:50 +04:00
CMakeLists.txt Global CMake reorganization: 2012-02-03 11:26:49 +00:00