Roman Donchenko 9218f4976c Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/contrib/src/retina.cpp modules/gpu/perf/perf_video.cpp modules/gpuoptflow/src/tvl1flow.cpp modules/ocl/include/opencv2/ocl/ocl.hpp modules/ocl/perf/perf_calib3d.cpp modules/ocl/perf/perf_color.cpp modules/ocl/perf/perf_match_template.cpp modules/ocl/src/precomp.hpp samples/gpu/stereo_multi.cpp		2013-09-02 19:44:51 +04:00
..
15-puzzle	Feature #2893 Create Java sample without layout.xml implemented.	2013-04-10 13:38:59 +04:00
camera-calibration	Adjusted the camera calibration sample to master API.	2013-08-13 14:55:27 +04:00
color-blob-detection	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
face-detection	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
hello-android	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
image-manipulations	Bug #3238 Android sample image manipulations blinks in non-preview modes fixed.	2013-08-28 15:08:13 +04:00
native-activity	Normalized file endings.	2013-08-21 18:59:25 +04:00
tutorial-1-camerapreview	Normalized file endings.	2013-08-21 18:59:25 +04:00
tutorial-2-mixedprocessing	Waning fixes for Android samples	2013-04-05 12:17:45 +04:00
tutorial-3-cameracontrol	Normalized file endings.	2013-08-21 18:59:25 +04:00
.gitignore	Normalized file endings.	2013-08-21 18:59:25 +04:00
CMakeLists.txt	Fixed build of camera calibration android sample	2013-08-08 09:31:25 +04:00