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
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
.gitignore
.project
AndroidManifest.xml	Delete a bunch more trailing whitespace that slipped through the cracks.	2013-09-04 16:13:27 +04:00
CMakeLists.txt