opencv/platforms/android
Roman Donchenko 48432502b6 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
	modules/core/CMakeLists.txt
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/highgui/src/grfmt_tiff.cpp
	modules/imgproc/src/clahe.cpp
	modules/imgproc/src/moments.cpp
	modules/nonfree/CMakeLists.txt
	modules/ocl/perf/perf_ml.cpp
	modules/superres/CMakeLists.txt
2014-02-25 15:02:24 +04:00
..
libinfo Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-27 15:28:14 +04:00
package Merge remote-tracking branch 'origin/2.4' into merge-2.4 2014-01-27 15:28:14 +04:00
service typo 2014-02-18 14:24:17 +04:00
android.toolchain.cmake Android toolchain file sync with original project. 2014-01-30 11:08:49 +04: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

See http://opencv.org/android