Merge branch '2.4'

2013-03-21 20:59:18 +04:00
parent bbae05413d b6365699ee
commit 1ca8f33b4e
276 changed files with 11834 additions and 5170 deletions
--- a/modules/gpu/test/test_precomp.hpp
+++ b/modules/gpu/test/test_precomp.hpp
@@ -76,11 +76,10 @@
    #include "opencv2/imgproc.hpp"
    #include "opencv2/video.hpp"
    #include "opencv2/ts.hpp"
+    #include "opencv2/ts/gpu_test.hpp"
    #include "opencv2/gpu.hpp"
-    #include "opencv2/nonfree.hpp"
    #include "opencv2/legacy.hpp"

-    #include "utility.hpp"
    #include "interpolation.hpp"
    #include "main_test_nvidia.h"
 #endif