From: d15521469561 Date: Mon, 17 Apr 2023 12:31:18 +0000 (+0800) Subject: Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=fdd9f896aee224941f9972b45ba85a2659af844f;p=mirrors%2FASR1603_G5.git Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5 # Conflicts: # 3.code/1.watch/2.code/ui_WatchFaceScreen.py # 3.code/1.watch/2.code/ui_main_menu.py --- fdd9f896aee224941f9972b45ba85a2659af844f