opencv/modules/core/doc
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
..
pics merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
basic_structures.rst Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
clustering.rst Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
command_line_parser.rst Update documentation 2013-03-22 22:14:54 +04:00
core.rst Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
drawing_functions.rst Normalized file endings. 2013-08-21 18:59:25 +04:00
dynamic_structures.rst Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
intro.rst Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
old_basic_structures.rst Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
old_xml_yaml_persistence.rst Remove documentation for old python wrapper 2013-04-12 19:37:40 +04:00
opengl_interop.rst Fixed documentation errors. 2013-08-06 18:07:08 +04:00
operations_on_arrays.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00
utility_and_system_functions_and_macros.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-07-03 19:53:21 +04:00
xml_yaml_persistence.rst Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-08-13 12:56:39 +04:00