mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-02 07:39:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
26d53c7435
opencv/modules/java/generator
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
..
config Move cv::Matx and cv::Vec to separate header 2013-04-01 15:24:33 +04:00
src Revert commit 994e07db0 (PR #1715), because it's irrelevant for master. 2013-11-06 12:32:03 +04:00
gen_java.py Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-12-23 18:50:17 +04:00
gen_javadoc.py Fixed the shebang lines on the Python scripts. 2013-04-11 18:37:23 +04:00
rst_parser.py fix documentation 2013-09-02 14:00:44 +04:00