From 5fa7c97d9544e7afdf781a93e8ffb58dce22c977 Mon Sep 17 00:00:00 2001
From: pansen <pansen626@sina.com>
Date: 星期五, 08 三月 2019 14:10:35 +0800
Subject: [PATCH] Merge branch 'yw.1.2.fixbug' of ssh://192.168.1.226:29418/development/c++ into yw.1.2

---
 QiaoJiaSystem/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/QiaoJiaSystem/CMakeLists.txt b/QiaoJiaSystem/CMakeLists.txt
index a2e7f1d..1db175e 100644
--- a/QiaoJiaSystem/CMakeLists.txt
+++ b/QiaoJiaSystem/CMakeLists.txt
@@ -34,6 +34,6 @@
 #add_subdirectory(VideoToImage)
 add_subdirectory(UnitTest)
 add_subdirectory(VideoToImageMulth)
-add_subdirectory(GB28181DecoderModel)
+#add_subdirectory(GB28181DecoderModel)
 #add_subdirectory(FaceSearchDbWithImg)
 

--
Gitblit v1.8.0