generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
e2f00ce846
opencv/modules/java/android_test/src/org/opencv/test
History
Roman Donchenko 4cf9990d4e Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	doc/tutorials/definitions/noContent.rst
	doc/tutorials/gpu/gpu-basics-similarity/gpu-basics-similarity.rst
	doc/tutorials/introduction/android_binary_package/dev_with_OCV_on_Android.rst
	doc/tutorials/introduction/how_to_write_a_tutorial/how_to_write_a_tutorial.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/internal.hpp
	modules/core/include/opencv2/core/version.hpp
	modules/gpu/CMakeLists.txt
	modules/highgui/perf/perf_output.cpp
	modules/highgui/test/test_video_io.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/main.cpp
	modules/ocl/src/hog.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/opencl/moments.cl
	modules/ocl/test/main.cpp
	modules/ocl/test/test_moments.cpp
	modules/python/test/test.py
	modules/ts/include/opencv2/ts/ts_perf.hpp
	modules/ts/src/precomp.hpp
	modules/ts/src/ts_perf.cpp
2013-07-03 19:53:21 +04:00
..
android Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
calib3d Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-06-25 15:55:52 +04:00
core fix failing test 2013-06-05 12:41:09 +04:00
features2d Merge branch '2.4' 2013-04-05 21:11:59 +04:00
highgui Test execution inside Eclipse fixed; 2012-11-20 10:45:46 +04:00
imgproc Move border type constants and Moments class to core module 2013-04-10 19:14:24 +04:00
ml Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
objdetect Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
photo Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
utils Move cv::KeyPoint and cv::DMatch to core 2013-03-26 16:08:43 +04:00
video merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
OpenCVTestCase.java Move cv::KeyPoint and cv::DMatch to core 2013-03-26 16:08:43 +04:00
OpenCVTestRunner.java Removed references to opencv.itseez.com 2013-06-28 12:48:12 +04:00