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

..

ocl

Merge pull request #1365 from bitwangyaoyao:2.4_bilateral

2013-09-09 16:46:33 +04:00

ocl.hpp

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

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