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
..
camera_activity.hpp	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
camera_properties.h	merged all the latest changes from 2.4 to trunk	2012-04-13 21:50:59 +00:00