opencv

History

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

.settings

Improving compatibility with the latest Android SDK (r21) and NDK (r8c).

2012-11-20 18:40:22 +04:00

res

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

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

src/org/opencv/test

Merge commit '43aec5ad' into merge-2.4

2013-08-27 13:26:44 +04:00

.classpath

Normalize line endings and whitespace