opencv/samples/android/hello-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
..
cmake_android.cmd Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
cmake_android.sh Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
CMakeLists.txt HelloAndroid sample is moved to samples/android 2011-07-01 13:12:05 +00:00
main.cpp Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
run.cmd Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
run.sh Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00