3 Commits

Author	SHA1	Message	Date
Andrey Kamaev	bd0e0b5800	Merged the trunk r8589:8653 - all changes related to build warnings	2012-06-15 13:04:17 +00:00
Vadim Pisarevsky	60ebe2003f	fixed multiple warnings on Windows. fixed bug #1368	2011-10-03 11:00:28 +00:00
Vadim Pisarevsky	ae83fe7645	added hybrid (feature-based & meanshift-based) tracker (by Pushkar)	2011-08-26 12:22:19 +00:00