Merge branch 'yw.1.2.fixbug' of http://192.168.1.226:10010/r/development/c+...

xuxiuxi

2019-03-11 8b7ff0dd9923f5ee2fa4b16b73ebdb7a6c1dc0a0

 QiaoJiaSystem/VideoToImage/CMakeLists.txt

@@ -68,7 +68,7 @@
    /usr/include/x86_64-linux-gnu/qt5/QtCore/
    /usr/include/x86_64-linux-gnu/qt5/QtSql/

    ../../BasicPlatForm/libs/hiredis-master/include
    ../../../BasicPlatForm/libs/hiredis-master/include
    ../../../BasicPlatForm/basic/timer_counter/
)