generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9c83f6c4fb
opencv/modules/java
History
Roman Donchenko 9c83f6c4fb Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	modules/core/include/opencv2/core/version.hpp
	modules/cudacodec/src/ffmpeg_video_source.cpp
	modules/gpu/src/video_writer.cpp
	modules/highgui/test/test_ffmpeg.cpp
	modules/highgui/test/test_video_io.cpp
	modules/highgui/test/test_video_pos.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/blend.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/safe_call.hpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_moments.cpp
	samples/ocl/squares.cpp
2013-11-05 16:38:23 +04:00
..
android_lib Merge pull request #800 from asmorkalov:android_cam_idx_semantic 2013-04-29 10:00:08 +04:00
android_test Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-09-10 11:30:19 +04:00
generator Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00
test Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-10-22 14:28:00 +04:00
build.xml.in Fix for encoding errors when building Java source 2013-03-27 17:43:00 +04:00
check-tests.py Normalized file endings. 2013-08-21 18:59:25 +04:00
CMakeLists.txt Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-11-05 16:38:23 +04:00