合并代码解决冲突

miyanhui

2019-02-18 b5413f1f00fcf13104b07807e2046372764ef8dc

 QiaoJiaSystem/RapidStructureApp/CMakeLists.txt

@@ -16,6 +16,7 @@
    ../../../BasicPlatForm/basic/pipe/TimerElement.cpp
    ../../../BasicPlatForm/basic/util/file/FileUtil.cpp
    ../../../BasicPlatForm/basic/pipe_element/ffmpeg/ffmpegRecoder/FileRecorder.cpp
    ../../../BasicPlatForm/basic/timer_counter/Clocktimer.cpp
    )

SET(LIBS