Alexander Alekhin 4c05a697fa Merge remote-tracking branch 'upstream/3.4' into merge-3.4		2021-08-28 21:30:28 +00:00
..
doc	Merge pull request #18838 from alalek:video_tracking_api	2020-11-18 11:04:15 +00:00
include/opencv2	Merge pull request #20036 from APrigarina:tracking_api	2021-05-31 20:23:37 +00:00
misc	java: force using of 'Ptr<>' for OpenCV classes	2021-07-02 21:13:49 +00:00
perf	Merge pull request #18838 from alalek:video_tracking_api	2020-11-18 11:04:15 +00:00
src	Merge pull request #20243 from APrigarina:fix_tracking_api	2021-06-08 15:46:57 +00:00
test	Merge remote-tracking branch 'upstream/3.4' into merge-3.4	2021-08-28 21:30:28 +00:00
CMakeLists.txt	Merge pull request #18838 from alalek:video_tracking_api	2020-11-18 11:04:15 +00:00