opencv/platforms/android
Roman Donchenko 4f2b126b7b Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/core/include/opencv2/core/version.hpp
	modules/core/src/out.cpp
	modules/cudaimgproc/test/test_hough.cpp
	modules/gpu/doc/introduction.rst
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/generalized_hough.cpp
	modules/nonfree/perf/perf_main.cpp
2014-04-07 14:59:34 +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 OpenCV version++. OpenCV Manager version++. 2014-03-31 15:00:25 -07: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