opencv/doc/tutorials/imgproc/imgtrans
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
..
canny_detector Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
copyMakeBorder Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00
filter_2d Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00
hough_circle Merge remote-tracking branch 'origin/2.4' into merge-2.4 2013-09-10 11:30:19 +04:00
hough_lines Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
laplace_operator Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00
remap Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00
sobel_derivatives Main module headers are moved 1 level up 2013-03-13 17:26:56 +04:00
warp_affine Merge commit '43aec5ad' into merge-2.4 2013-08-27 13:26:44 +04:00