opencv

History

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

bioinspired

retina included in namespace bioinspired + followed suggestions made by Vadim

2013-07-14 19:28:37 +02:00

calib3d

Move C API of opencv_calib3d to separate file

2013-04-11 21:00:17 +04:00

core

Merge commit '43aec5ad' into merge-2.4

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

features2D

Merge remote-tracking branch 'origin/2.4'