Roman Donchenko 799d2dabd6 Merge remote-tracking branch 'origin/2.4' into merge-2.4 ... Conflicts: modules/core/test/test_arithm.cpp modules/cuda/src/cascadeclassifier.cpp modules/imgproc/doc/geometric_transformations.rst modules/objdetect/src/hog.cpp modules/ocl/perf/perf_imgproc.cpp modules/ocl/src/gftt.cpp modules/ocl/src/moments.cpp		2014-04-14 16:08:02 +04:00
..
ocl
test_brisk.cpp
test_descriptors_regression.cpp
test_detectors_regression.cpp
test_fast.cpp
test_keypoints.cpp
test_main.cpp
test_matchers_algorithmic.cpp
test_mser.cpp
test_nearestneighbors.cpp
test_orb.cpp
test_precomp.hpp
test_rotation_and_scale_invariance.cpp