opencv/samples/android
Roman Donchenko 2c4bbb313c Merge commit '43aec5ad' into merge-2.4
Conflicts:
	cmake/OpenCVConfig.cmake
	cmake/OpenCVLegacyOptions.cmake
	modules/contrib/src/retina.cpp
	modules/gpu/doc/camera_calibration_and_3d_reconstruction.rst
	modules/gpu/doc/video.rst
	modules/gpu/src/speckle_filtering.cpp
	modules/python/src2/cv2.cv.hpp
	modules/python/test/test2.py
	samples/python/watershed.py
2013-08-27 13:26:44 +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 Feature #2833 Sepia size in Image Manipulations demo implemented. 2013-02-26 11:25:33 +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