opencv/doc/tutorials/core
Roman Donchenko 9218f4976c Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/contrib/src/retina.cpp
	modules/gpu/perf/perf_video.cpp
	modules/gpuoptflow/src/tvl1flow.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_calib3d.cpp
	modules/ocl/perf/perf_color.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/src/precomp.hpp
	samples/gpu/stereo_multi.cpp
2013-09-02 19:44:51 +04:00
..
adding_images
basic_geometric_drawing
basic_linear_transform
discrete_fourier_transform
file_input_output_with_xml_yml
how_to_scan_images
interoperability_with_OpenCV_1
mat_the_basic_image_container
mat-mask-operations
random_generator_and_text
table_of_content_core