samples/android · b31293c984ac7c63abdd54889a858d50f287aa1b · submodule / opencv · GitLab

History Find file

Merge remote-tracking branch 'origin/2.4' into merge-2.4 · c05bfe9d

Roman Donchenko authored Jul 08, 2013

Conflicts:
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/ocl/src/opencl/stereobp.cl
	modules/ocl/src/stereobp.cpp

c05bfe9d

Name	Last commit	Last update
..
15-puzzle		Loading commit data...
color-blob-detection		Loading commit data...
face-detection		Loading commit data...
hello-android		Loading commit data...
image-manipulations		Loading commit data...
native-activity		Loading commit data...
tutorial-1-camerapreview		Loading commit data...
tutorial-2-mixedprocessing		Loading commit data...
tutorial-3-cameracontrol		Loading commit data...
.gitignore		Loading commit data...
CMakeLists.txt		Loading commit data...