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/samples/ocl/performance.cpp
+++ b/samples/ocl/performance.cpp
@@ -16,6 +16,7 @@
 #define USE_OPENCL
 #ifdef USE_OPENCL
 #include "opencv2/ocl.hpp"
+#include "opencv2/nonfree/ocl.hpp"
 #endif

 #define TAB "    "