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/gpu/src/error.cpp
+++ b/modules/gpu/src/error.cpp
@@ -39,7 +39,6 @@
 // the use of this software, even if advised of the possibility of such damage.
 //
 //M*/
-
 #include "precomp.hpp"

 using namespace cv;