Merge branch 'master' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/ASR1603_G5
Merge branch 'master' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/ASR1603_G5
Merge branch 'master' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/ASR1603_G5
Merge branch 'master' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/ASR1603_G5
Merge branch 'master' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/ASR1603_G5
Merge branch 'master' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/ASR1603_G5
Merge branch 'master' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/ASR1603_G5
Merge branch 'master' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/ASR1603_G5
# Conflicts:
# 3.code/1.watch/2.code/main.py
# 3.code/1.watch/2.code/main_1.py
Merge branch 'master' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/ASR1603_G5
Merge branch 'master' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/ASR1603_G5
# Conflicts:
# 3.code/1.watch/2.code/main_1.py
# 3.code/1.watch/2.code/ui.py
# 3.code/1.watch/2.code/ui_setting.py
Merge branch 'master' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/ASR1603_G5
# Conflicts:
# 3.code/1.watch/2.code/ui_setting.py
Merge branch 'master' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0/ASR1603_G5
Merge branch 'master' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/ASR1603_G5
# Conflicts:
# 3.code/1.watch/2.code/ui_main_menu.py
Merge branch 'master' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/ASR1603_G5
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
Merge branch 'master' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/ASR1603_G5
# Conflicts:
# 3.code/1.watch/2.code/mgr.py
Merge branch 'master' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/ASR1603_G5
Merge branch 'master' of codeup.aliyun.com:
64191456b9581d62e8f81ac0/ASR1603_G5
# Conflicts:
# 3.code/1.watch/2.code/mgr.py