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
..
drawable	Convert test image to losless format	2013-01-17 20:43:57 +04:00
layout	Delete a bunch more trailing whitespace that slipped through the cracks.	2013-09-04 16:13:27 +04:00
raw	Normalize line endings and whitespace	2012-10-17 15:57:49 +04:00
values	Fixed Android tests resources and settings	2011-06-30 14:16:14 +00:00