4 Commits

Author	SHA1	Message	Date
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
Roman Donchenko	e9a28f66ee	Normalized file endings.	2013-08-21 18:59:25 +04:00
Andrey Kamaev	ad5cddc007	Main module headers are moved 1 level up ... e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp> Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>	2013-03-13 17:26:56 +04:00
Andrey Kamaev	206aa50f86	Added Android native camera module	2011-06-16 18:00:41 +00:00