opencv/doc/tutorials/core
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
..
adding_images Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
basic_geometric_drawing Converted tabs to spaces. 2013-08-21 18:59:26 +04:00
basic_linear_transform Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
discrete_fourier_transform Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
file_input_output_with_xml_yml Normalized file endings. 2013-08-21 18:59:25 +04:00
how_to_scan_images Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
interoperability_with_OpenCV_1 Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
mat_the_basic_image_container Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
mat-mask-operations Deleted all trailing whitespace. 2013-08-21 18:59:24 +04:00
random_generator_and_text svn repository web references are replaced with links to git 2012-08-07 14:30:36 +04:00
table_of_content_core Normalized file endings. 2013-08-21 18:59:25 +04:00