generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
30d7e1c33d
opencv/doc/tutorials/core
History
Roman Donchenko 81eb4bd8be Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	modules/bioinspired/doc/retina/index.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/stat.cpp
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/imgproc/src/filter.cpp
	modules/legacy/src/dpstereo.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/doc/object_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrdown.cpp
	modules/ocl/src/pyrup.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/utility.hpp
2013-10-01 15:57:33 +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 Added typo in docs of tutorial 2013-09-13 15:01:18 +02: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