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
..
doc	updated documentation	2013-07-12 08:12:48 +04:00
include/opencv2	refactored gpu::ImagePyramid (converted it to abstract interface)	2013-07-12 08:12:48 +04:00
perf	Nuked the rest of the precomp.cpp files.	2013-09-02 19:53:45 +04:00
src	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2013-09-10 11:30:19 +04:00
test	Nuked the rest of the precomp.cpp files.	2013-09-02 19:53:45 +04:00
CMakeLists.txt	Revert "Revert "Merge pull request #836 from jet47:gpu-modules""	2013-06-07 13:05:39 +04:00