merged the trunk r8704:8716

2012-06-28 16:13:29 +00:00
parent 2777ebb8a0
commit 680a44189c
83 changed files with 2402 additions and 2052 deletions
--- a/modules/stitching/perf/perf_stich.cpp
+++ b/modules/stitching/perf/perf_stich.cpp
@@ -1,5 +1,4 @@
 #include "perf_precomp.hpp"
-
 #include "opencv2/highgui/highgui.hpp"
 #include "opencv2/core/internal.hpp"
 #include "opencv2/flann/flann.hpp"