From 33fe4b9b675afc631eb9ed12fe5db1e01972facf Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期四, 14 三月 2019 14:55:52 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2

---
 QiaoJiaSystem/build/FaceDetectResourcesTest |    0 
 1 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/QiaoJiaSystem/build/FaceDetectResourcesTest b/QiaoJiaSystem/build/FaceDetectResourcesTest
index 23a18af..1afe23e 100755
--- a/QiaoJiaSystem/build/FaceDetectResourcesTest
+++ b/QiaoJiaSystem/build/FaceDetectResourcesTest
Binary files differ

--
Gitblit v1.8.0