opencv/modules/legacy/include/opencv2/legacy
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
..
blobtrack.hpp Normalize line endings and whitespace 2012-10-17 15:57:49 +04:00
compat.hpp Minimize usages of legacy C API inside the library 2013-04-16 12:00:02 +04:00
legacy.hpp Make imgproc.hpp independent from C API 2013-04-08 15:47:28 +04:00
streams.hpp Normalized file endings. 2013-08-21 18:59:25 +04:00