Skip to content

O
opencv_contrib
Commit bc08607d authored by Vladimir's avatar Vladimir
Browse files
Options

Merge remote-tracking branch 'origin/TLD/VOT2015_Datasets_Support' into… 

Merge remote-tracking branch 'origin/TLD/VOT2015_Datasets_Support' into TLD/VOT2015_Datasets_Support

Conflicts:
	modules/datasets/src/track_vot.cpp
	modules/tracking/include/opencv2/tracking/tracker.hpp
parents cbf79333 beaceb4d
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
modules/tracking/include/opencv2/tracking/tracker.hpp
View file @ bc08607d
...@@ -1256,7 +1256,7 @@ class CV_EXPORTS_W TrackerKCF : public Tracker ...@@ -1256,7 +1256,7 @@ class CV_EXPORTS_W TrackerKCF : public Tracker
@sa Tracker, MultiTrackerTLD @sa Tracker, MultiTrackerTLD
*/ */
class CV_EXPORTS_W MultiTracker class CV_EXPORTS_W MultiTracker_Alt
{ {
public: public:
/** @brief Constructor for Multitracker /** @brief Constructor for Multitracker
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment