Merge pull request #2146 from SpecLad:merge-2.4

2014-01-17 16:28:29 +04:00
parent 659c5345d9 092f916db9
commit 79fcc06a4b
50 changed files with 323 additions and 312 deletions
--- a/modules/calib3d/test/test_chessboardgenerator.hpp
+++ b/modules/calib3d/test/test_chessboardgenerator.hpp
@@ -34,7 +34,7 @@ private:
    Mat rvec, tvec;
 };

-};
+}


 #endif