Snicker Git - mirrors/FD230.git/commit

projects / mirrors / FD230.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8bbe0fe 56ad2ab)

author	Caisking <3449750381@qq.com>
	Wed, 31 Jul 2024 08:48:41 +0000 (16:48 +0800)
committer	Caisking <3449750381@qq.com>
	Wed, 31 Jul 2024 08:48:41 +0000 (16:48 +0800)
commit	84c4b200e0523d275891b5cb4ec65c417b6901e4
tree	f98c7b736def131ae90dc3438069c7997c75d42a	tree \| snapshot
parent	8bbe0fefbd72ddb5190593706fd44840bd2a7daf	commit \| diff
parent	56ad2abaa75d3a4c0ed1ce38740b0ab18ecfee99	commit \| diff

Merge branch 'sdk602patch0626' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230 into sdk602patch0626

14 files changed:

code/sdk/application/wearable/fd230app/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
code/sdk/application/wearable/fd230app/nativelauncher/include/ui_resource_string.h	diff1 \|	diff2 \|	blob \| history
code/sdk/application/wearable/fd230app/nativeui/main/src/MainPresenterSample.cpp	diff1 \|	diff2 \|	blob \| history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/en.lang	diff1 \|	diff2 \|	blob \| history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/ui_resource_string.h	diff1 \|	diff2 \|	blob \| history
code/sdk/build/config/target_config/brandy/mk_fs_image/fd230/fs/user/res/font/zh.lang	diff1 \|	diff2 \|	blob \| history
code/sdk/drivers/peripheral/config/include/ConfigModel.h	diff1 \|	diff2 \|	blob \| history
tools/language_tool/Language_xml/input_list_en.txt	diff1 \|	diff2 \|	blob \| history
tools/language_tool/Language_xml/input_list_zh.txt	diff1 \|	diff2 \|	blob \| history
tools/language_tool/Language_xml/language_en.xml	diff1 \|	diff2 \|	blob \| history
tools/language_tool/Language_xml/language_zh.xml	diff1 \|	diff2 \|	blob \| history
tools/language_tool/font/en.lang	diff1 \|	diff2 \|	blob \| history
tools/language_tool/font/ui_resource_string.h	diff1 \|	diff2 \|	blob \| history
tools/language_tool/font/zh.lang	diff1 \|	diff2 \|	blob \| history

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