From 9c1dbad3fcf04c4c797437531031cfaefe28bfcf Mon Sep 17 00:00:00 2001
From: chenshijun <chenshijun@aiotlink.com>
Date: 星期二, 19 三月 2019 18:05:57 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2.fixbug

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

diff --git a/QiaoJiaSystem/build/RecordVideo b/QiaoJiaSystem/build/RecordVideo
index 3663e73..f1c34cc 100755
--- a/QiaoJiaSystem/build/RecordVideo
+++ b/QiaoJiaSystem/build/RecordVideo
Binary files differ

--
Gitblit v1.8.0