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

..

facerec

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

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

contrib.rst

last warnings solved

2013-06-13 07:36:37 +02:00

openfabmap.rst

Like mentioned by Andrei Pavlenko after merging pullrequest #1206, a wrong

2013-08-07 14:49:33 +02:00

stereo.rst

Normalized file endings.

2013-08-21 18:59:25 +04:00