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

..

opencv

Merge commit '43aec5ad' into merge-2.4

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

opencv2

updated demos and tutorial regarding the Retina class transfer to bioinspired module.

2013-06-12 22:43:36 +02:00

CMakeLists.txt

Normalized file endings.

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