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

Auron-X · Auron-X · commit bc08607d1342 · 2015-08-28T01:45:46.000+09:00
Conflicts:
	modules/datasets/src/track_vot.cpp
	modules/tracking/include/opencv2/tracking/tracker.hpp
diff --git a/modules/tracking/include/opencv2/tracking/tracker.hpp b/modules/tracking/include/opencv2/tracking/tracker.hpp
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1256,7 +1256,7 @@ class CV_EXPORTS_W TrackerKCF : public Tracker`
`1256`	`1256`
`1257`	`1257`	`@sa Tracker, MultiTrackerTLD`
`1258`	`1258`	`*/`
`1259`		`-class CV_EXPORTS_W MultiTracker`
	`1259`	`+class CV_EXPORTS_W MultiTracker_Alt`
`1260`	`1260`	`{`
`1261`	`1261`	`public:`
`1262`	`1262`	`/** @brief Constructor for Multitracker`