Commit bc08607d authored by Vladimir's avatar Vladimir

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
......@@ -1256,7 +1256,7 @@ class CV_EXPORTS_W TrackerKCF : public Tracker
@sa Tracker, MultiTrackerTLD
*/
class CV_EXPORTS_W MultiTracker
class CV_EXPORTS_W MultiTracker_Alt
{
public:
/** @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