Roman Donchenko c05bfe9d6d Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/features2d/include/opencv2/features2d/features2d.hpp modules/ocl/src/opencl/stereobp.cl modules/ocl/src/stereobp.cpp		2013-07-08 18:47:38 +04:00
..
15-puzzle	Feature #2893 Create Java sample without layout.xml implemented.	2013-04-10 13:38:59 +04:00
color-blob-detection	Merge branch '2.4'	2013-02-12 16:30:18 +04:00
face-detection	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-06-10 18:18:01 +04:00
hello-android	Fix build errors	2013-04-08 17:10:31 +04:00
image-manipulations	Feature #2833 Sepia size in Image Manipulations demo implemented.	2013-02-26 11:25:33 +04:00
native-activity	Various fixes in android sample NativeActivity.	2013-07-05 14:08:37 +04:00
tutorial-1-camerapreview	Merge remote-tracking branch 'origin/2.4'	2013-05-21 17:19:23 +04:00
tutorial-2-mixedprocessing	Waning fixes for Android samples	2013-04-05 12:17:45 +04:00
tutorial-3-cameracontrol	Merge remote-tracking branch 'origin/2.4'	2013-05-21 17:19:23 +04:00
.gitignore	Add gitignore for Android tests and samples	2012-09-10 15:48:57 +04:00
CMakeLists.txt	Improve handling of native_app_glue dependency in Android samples	2013-05-13 17:01:18 +04:00