Merge branch 'master' of http://120.77.240.215:9701/chenyiliang/projectmaterial

69878c34 · 周嘉慧 · c1c0876b · 922b79c3 · 69878c34 · 69878c34
Commit 69878c34 authored Feb 20, 2021 by 周嘉慧
9 changed files
--- a/1960x1760/福字纹（正方形）-02.jpg
+++ b/1960x1760/福字纹（正方形）-02.jpg
--- a/雕刻机切图/android/drawable-xxhdpi/进度条.png
+++ b/雕刻机切图/android/drawable-xxhdpi/进度条.png
--- a/雕刻机切图/android/drawable-xxhdpi/暂停.png
+++ b/雕刻机切图/android/drawable-xxhdpi/暂停.png
--- a/雕刻机切图/android/drawable-xxhdpi/╧┬╥╗╒┼.png
+++ b/雕刻机切图/android/drawable-xxhdpi/╧┬╥╗╒┼.png
--- a/雕刻机切图/android/drawable-xxhdpi/停止拷贝.png
+++ b/雕刻机切图/android/drawable-xxhdpi/停止拷贝.png
--- a/雕刻机切图/android/drawable-xxxhdpi/进度条.png
+++ b/雕刻机切图/android/drawable-xxxhdpi/进度条.png
--- a/雕刻机切图/android/drawable-xxxhdpi/暂停.png
+++ b/雕刻机切图/android/drawable-xxxhdpi/暂停.png
--- a/雕刻机切图/android/drawable-xxxhdpi/╧┬╥╗╒┼.png
+++ b/雕刻机切图/android/drawable-xxxhdpi/╧┬╥╗╒┼.png
--- a/雕刻机切图/android/drawable-xxxhdpi/停止拷贝.png
+++ b/雕刻机切图/android/drawable-xxxhdpi/停止拷贝.png