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/ocl/test/precomp.hpp
+++ b/modules/ocl/test/precomp.hpp
@@ -68,7 +68,6 @@
 #include "opencv2/video.hpp"
 #include "opencv2/ocl.hpp"
 //#include "opencv2/calib3d.hpp"
-//#include "opencv2/nonfree.hpp"

 #include "utility.hpp"
 #include "interpolation.hpp"