opencv/doc/tutorials/imgproc
Roman Donchenko 95c2e8b51f Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	.gitignore
	doc/tutorials/objdetect/cascade_classifier/cascade_classifier.rst
	modules/gpu/src/match_template.cpp
	modules/imgproc/include/opencv2/imgproc/imgproc.hpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/perf/perf_precomp.hpp
2013-09-10 11:30:19 +04:00
..
erosion_dilatation Converted tabs to spaces. 2013-08-21 18:59:26 +04:00
gausian_median_blur_bilateral_filter Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00
histograms Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
imgtrans Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-09-10 11:30:19 +04:00
opening_closing_hats Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
pyramids Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
shapedescriptors Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
table_of_content_imgproc Normalized file endings. 2013-08-21 18:59:25 +04:00
threshold Converted tabs to spaces. 2013-08-21 18:59:26 +04:00