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

..

cuda

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-09-10 11:30:19 +04:00

precomp.hpp

renamed gpu_private.hpp to private.gpu.hpp

2013-06-10 12:40:32 +04:00

pyramids.cpp

Boring changes - gpuwarping.

2013-09-05 19:02:59 +04:00

remap.cpp

switched to Input/Output Array in gpuwarping functions

2013-07-12 08:12:48 +04:00

resize.cpp

Merge remote-tracking branch 'origin/2.4' into merge-2.4

2013-08-27 19:15:47 +04:00

warp.cpp

switched to Input/Output Array in gpuwarping functions

2013-07-12 08:12:48 +04:00