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

..

.settings

Improving compatibility with the latest Android SDK (r21) and NDK (r8c).

2012-11-20 18:40:22 +04:00

res

Code review coments fixed. Lint wornings fixed.

2012-10-23 20:06:58 +04:00

src/org/opencv/samples/colorblobdetect

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

.classpath

Code review coments fixed. Lint wornings fixed.

2012-10-23 20:06:58 +04:00

.project

Android samples renaming was done. Icon updated.

2012-07-02 10:06:08 +00:00

AndroidManifest.xml

hiding empty menu button on Android 4

2012-12-25 17:49:10 +04:00

CMakeLists.txt

Normalized file endings.

2013-08-21 18:59:25 +04:00