Merge branch '2.4'

2013-03-29 18:48:06 +04:00
parent 3ceca9b7b1 e143706ef9
commit f77a375354
291 changed files with 5110 additions and 2325 deletions
--- a/modules/nonfree/perf/perf_precomp.hpp
+++ b/modules/nonfree/perf/perf_precomp.hpp
@@ -14,6 +14,7 @@
 #include "opencv2/highgui.hpp"

 #include "opencv2/opencv_modules.hpp"
+
 #ifdef HAVE_OPENCV_OCL
 #  include "opencv2/nonfree/ocl.hpp"
 #endif