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
..
highgui	Merge commit '43aec5ad' into merge-2.4	2013-08-27 13:26:44 +04:00
highgui.hpp	removed ogl::Texture2D support from InputArray	2013-06-10 12:40:30 +04:00