Commit Graph

5 Commits

Author SHA1 Message Date
Vadim Pisarevsky
d5a0088bbe merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
Vadim Pisarevsky
60ebe2003f fixed multiple warnings on Windows. fixed bug #1368 2011-10-03 11:00:28 +00:00
Anatoly Baksheev
415978b1c9 warnings 2011-09-05 14:37:27 +00:00
Vadim Pisarevsky
ae83fe7645 added hybrid (feature-based & meanshift-based) tracker (by Pushkar) 2011-08-26 12:22:19 +00:00