处理合并冲突

Zhao Shuaihua
2 parents b309bd27 1b57a1c5
Showing 108 changed files with 104 additions and 26 deletions
.vscode/launch.json
3rdparty/spdlog-1.9.2/release/include/spdlog/async.h
3rdparty/spdlog-1.9.2/release/include/spdlog/async_logger-inl.h
3rdparty/spdlog-1.9.2/release/include/spdlog/async_logger.h
3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/argv.h
3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/env.h
3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/helpers-inl.h
3rdparty/spdlog-1.9.2/release/include/spdlog/cfg/helpers.h
3rdparty/spdlog-1.9.2/release/include/spdlog/common-inl.h
3rdparty/spdlog-1.9.2/release/include/spdlog/common.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/backtracer-inl.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/backtracer.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/circular_q.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/console_globals.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/file_helper-inl.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/file_helper.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/fmt_helper.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg-inl.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg.h
3rdparty/spdlog-1.9.2/release/include/spdlog/details/log_msg_buffer-inl.h
@@ -23,10 +23,10 @@
             }
             ]
         },{
-            "name": "test",
+            "name": "test_face",
             "type": "cppdbg",
             "request": "launch",
-            "program": "${workspaceFolder}/bin/test",
+            "program": "${workspaceFolder}/bin/test_face",
             "args": ["/opt/cmhu/data/Street.uvf","0", "0", "0"],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}/bin",