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

..

android

Boring changes - samples.

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

c

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

2013-09-02 19:44:51 +04:00

cpp

changed default parameters in CreateERFiltersNM{1,2} functions. They are not needed now in the sample example.

2013-09-06 19:10:53 +02:00

gpu

Boring changes - samples.

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

java

Normalized file endings.

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

MacOSX/FaceTracker

Converted tabs to spaces.

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

ocl

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

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

python2

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

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

winrt/ImageManipulations

Removed incorrect iCCP chunks from GUI resources.

2013-08-30 09:49:24 -04:00

CMakeLists.txt

add an ocl sample

2012-08-08 17:12:53 +08:00