projects / mirrors / ASR1603_G5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6105a5f e8d2ce4)
Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5
authord15521469561 <d155214695615@qq.com>
Mon, 17 Apr 2023 12:31:18 +0000 (20:31 +0800)
committerd15521469561 <d155214695615@qq.com>
Mon, 17 Apr 2023 12:31:18 +0000 (20:31 +0800)
# Conflicts:
# 3.code/1.watch/2.code/ui_WatchFaceScreen.py
# 3.code/1.watch/2.code/ui_main_menu.py


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.