更改冲突文件
authordxy <1731678236@qq.com>
Tue, 19 Mar 2024 11:22:17 +0000 (19:22 +0800)
committerdxy <1731678236@qq.com>
Tue, 19 Mar 2024 11:22:17 +0000 (19:22 +0800)
commitc693c97d879d8a8d8113a02ce56565cc79037c95
tree469bf2e9338d0f7cae024f4bc09801b5dc1883b7
parent13e747fe8012ef2d863676e2af16883bbd960a5b
parent8e1e7eb140c0231eb2571eb3826cc0fe3679ea1e
更改冲突文件
autobuild.sh
code/sdk/application/brandy/brandy_standard/thread_pri_init.c
code/sdk/application/wearable/fd230app/CMakeLists.txt
code/sdk/application/wearable/fd230app/nativelauncher/src/NativeLauncher.cpp
code/sdk/application/wearable/fd230app/nativeui/bluetooth/src/BluetoothPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/classicbluetooth/src/ClassicBlueToothPresenter.cpp
code/sdk/application/wearable/fd230app/nativeui/system/include/SystemView.h
code/sdk/application/wearable/fd230app/nativeui/system/src/SystemView.cpp
code/sdk/build/config/target_config/brandy/config.py