7 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	8b294c6c90	Remove documentation for old python wrapper	2013-04-12 19:37:40 +04:00
Andrey Kamaev	81a5988015	Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes)	2012-05-30 11:13:07 +00:00
Andrey Kamaev	6ca618277c	More fixes for documentation.	2012-05-28 20:11:38 +00:00
Vadim Pisarevsky	d5a0088bbe	merged 2.4 into trunk	2012-04-30 14:33:52 +00:00
Vadim Pisarevsky	bffd77ed87	moved planar subdiv docs to legacy; added Input/OutputArray docs to core	2012-04-28 12:59:21 +00:00