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
color-blob-detection
face-detection
hello-android
image-manipulations
native-activity	Various fixes in android sample NativeActivity.	2013-07-05 14:08:37 +04:00
tutorial-1-camerapreview
tutorial-2-mixedprocessing
tutorial-3-cameracontrol
.gitignore
CMakeLists.txt