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
..
doc	Merge pull request #2538 from ElenaGvozdeva:ipp_async_convert	2014-04-08 11:05:30 +04:00
include/opencv2	added macro for denoting region for suppression of "Wdeprecated-declarations"	2014-04-11 13:45:20 +04:00
perf	Enable ipp MeanStdDev calculation for 32F_C1 images. Decrease accuracy sanity check of the perfomance test	2014-04-07 14:26:49 +04:00
src	added macro for denoting region for suppression of "Wdeprecated-declarations"	2014-04-11 13:45:20 +04:00
test	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-04-14 16:08:02 +04:00
CMakeLists.txt	Merge remote-tracking branch 'origin/2.4' into merge-2.4	2014-02-25 15:02:24 +04:00