Merge branch 2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 30 Nov 2012 15:52:59 +0000 (19:52 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 30 Nov 2012 15:54:24 +0000 (19:54 +0400)
commite10ee89ec4233daadd688d24acdc1241f3a419a6
tree0ff7674124a4944e9558a2974507b0919d74d790
parent50bebd6f0b9c5ceeb1a1d530b6442d476c820ea8
parentf6ca38a579cb39acb6db7be8588ef58b9233e3ab
Merge branch 2.4
samples/android/face-detection/jni/DetectionBasedTracker_jni.cpp