generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
4036f6a3d0
opencv/modules/java/generator
History
Roman Donchenko 4036f6a3d0 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	apps/CMakeLists.txt
	modules/contrib/CMakeLists.txt
	modules/core/include/opencv2/core/version.hpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/java/generator/gen_java.py
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/cl_runtime/cl_runtime.cpp
	modules/ocl/src/columnsum.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/test/main.cpp
	modules/ocl/test/test_color.cpp
	modules/ocl/test/test_imgproc.cpp
	samples/gpu/CMakeLists.txt
2013-10-22 14:28:00 +04:00
..
config Move cv::Matx and cv::Vec to separate header 2013-04-01 15:24:33 +04:00
src Merge remote-tracking branch 'origin/2.4' 2013-10-01 15:57:33 +04:00
gen_java.py Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-22 14:28:00 +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