Roman Donchenko 029ffb7c2d Merge remote-tracking branch 'origin/2.4' into merge-2.4 ...

Conflicts:
	modules/core/src/gl_core_3_1.cpp
	modules/core/src/opencl/convert.cl
	modules/cudaimgproc/src/cuda/canny.cu
	modules/cudastereo/perf/perf_stereo.cpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/test/test_denoising.cpp
	modules/ocl/src/opencl/imgproc_resize.cl
	samples/cpp/Qt_sample/main.cpp

2014-02-17 15:24:05 +04:00

..

.settings

Native activity install fixed.

2013-04-03 14:43:23 +04:00

jni

Updated the native activity sample to master's API.

2013-09-09 18:17:02 +04:00

res

Base for Native Activity example added.

2013-03-18 10:37:11 +04:00

src/org/opencv/samples/NativeActivity

Application pause/resume fix for Android sample NativeActivity.

2014-02-13 16:47:02 +04:00

.classpath

Native activity install fixed.

2013-04-03 14:43:23 +04:00

.cproject

Various fixes in android sample NativeActivity.

2013-07-05 14:08:37 +04:00

.project

NativeActivity sample build with Eclipse CDT fixed.

2013-06-10 11:06:28 +04:00

AndroidManifest.xml

Various fixes in android sample NativeActivity.

2013-07-05 14:08:37 +04:00

CMakeLists.txt

CMakeLists.txt for Android native activity added.

2013-04-01 12:38:26 +04:00