Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2018-11-10 20:10:57 +00:00
parent c7d04c6c5c 56eebb926d
commit 1913482cf5
90 changed files with 6261 additions and 6657 deletions
@@ -713,7 +713,6 @@ protected:
 };

 //! @} objdetect
-
 }

 #include "opencv2/objdetect/detection_based_tracker.hpp"