Marina Kolpakova 680a44189c merged the trunk r8704:8716		2012-06-28 16:13:29 +00:00
..
Android.mk	Merged the trunk r8595:8668 (except iOS and new gpu functionality)	2012-06-15 13:21:26 +00:00
Application.mk	Merged the trunk r8408:8457 (inclusive)	2012-05-30 08:47:34 +00:00
DetectionBasedTracker_jni.cpp	merged the trunk r8704:8716	2012-06-28 16:13:29 +00:00
DetectionBasedTracker_jni.h	Merged Android samples from trunk r8423 r8533	2012-06-01 08:45:45 +00:00