mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-23 07:58:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
3d3b310ae1
opencv/platforms/android
History
Roman Donchenko 464a010f53 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/core/include/opencv2/core/operations.hpp
	modules/core/include/opencv2/core/version.hpp
	modules/core/src/gpumat.cpp
	modules/cudaimgproc/src/color.cpp
	modules/features2d/src/orb.cpp
	modules/imgproc/src/samplers.cpp
	modules/ocl/include/opencv2/ocl/matrix_operations.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	samples/ocl/facedetect.cpp
2013-12-10 12:51:00 +04:00
..
libinfo Switched OpenCV to a 3-component version number. 2013-11-15 19:41:53 +04:00
package Switched OpenCV to a 3-component version number. 2013-11-15 19:41:53 +04:00
service OpenCV Manager version++. 2013-12-06 18:53:03 +04:00
android.toolchain.cmake Applied feature #3375 and fix of pull 1842 to avoid merging problems later 2013-11-25 10:53:03 +01:00
java.rst android -> plarforms/android 2013-05-27 11:10:38 +04:00
README.android android -> plarforms/android 2013-05-27 11:10:38 +04:00
refman.rst Normalized file endings. 2013-08-21 18:59:25 +04:00

README.android 

See http://opencv.org/android