projects / mirrors / ASR1603_G5.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6937ab0 26904ca)
Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5
authordxy15521469561 <1731678236@qq.com>
Mon, 27 Nov 2023 07:49:42 +0000 (15:49 +0800)
committerdxy15521469561 <1731678236@qq.com>
Mon, 27 Nov 2023 07:49:42 +0000 (15:49 +0800)
commit44f51f862ff018ed46c518f7d2c05cac41c8a94d
tree8b701f2c525befba83a93a715d0a41d8b4d3d987tree | snapshot
parent6937ab011ae88e70c41b756e90808223958f85f8commit | diff
parent26904cafc8d708aacfb364bc606367358f3fa938commit | diff
Merge branch 'master' of codeup.aliyun.com:64191456b9581d62e8f81ac0/ASR1603_G5

# Conflicts:
# 2.sdk/Helios_SDK/services/microPython/py/scheduler.c
# 2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/alarm.py
# 2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/mgr.py
2.sdk/Helios_SDK/config/autoconf.h diff1 | diff2 | blob | history
2.sdk/Helios_SDK/config/config.in diff1 | diff2 | blob | history
2.sdk/Helios_SDK/config/config.mk diff1 | diff2 | blob | history
2.sdk/Helios_SDK/system/include/quectel_version.h diff1 | diff2 | blob | history
2.sdk/project/C06S/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip diff1 | diff2 | blob | history
2.sdk/project/D10/sdk/services/microPython/ports/quectel/core/main_init.py diff1 | diff2 | blob | history
2.sdk/project/D10/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip diff1 | diff2 | blob | history
2.sdk/project/K01/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_VOLTE/images/firmware_base_release_pack.zip diff1 | diff2 | blob | history
2.sdk/project/K5/sdk/system/platform/ASR_1606/boards/EG810MCN_GA_ALIPAY/images/firmware_base_release_pack.zip diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.