You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

liuyitao 7c0e313108 Squashed commit of the following: ... commit baed786b2d Author: liuyitao <2371837061@qq.com> Date: Wed Dec 27 20:32:47 2023 +0800 Signed-off-by: liuyitao <2371837061@qq.com> 更新 commit 21a77f4836 Author: liuyitao <2371837061@qq.com> Date: Wed Dec 27 20:28:08 2023 +0800 Signed-off-by: liuyitao <2371837061@qq.com> 更新 commit 65872f251e Author: liuyitao <2371837061@qq.com> Date: Wed Dec 27 19:58:26 2023 +0800 Signed-off-by: liuyitao <2371837061@qq.com> 更新 commit 944c6e7e6b Merge: 63094f1 2076caf Author: liuyitao <2371837061@qq.com> Date: Wed Dec 27 09:30:38 2023 +0800 Merge branch 'liuyitao-branch' of https://bdgit.educoder.net/p76igso9b/MiNotes into liuyitao-branch commit 63094f152e Author: liuyitao <2371837061@qq.com> Date: Wed Dec 27 09:24:37 2023 +0800 11 commit 69b8c477cc Author: liuyitao <2371837061@qq.com> Date: Wed Dec 27 08:46:16 2023 +0800 更新 commit 22944a8591 Author: liuyitao <2371837061@qq.com> Date: Tue Dec 26 22:54:46 2023 +0800 data commit 2076caf5a7 Author: liuyitao <2371837061@qq.com> Date: Tue Dec 26 22:54:46 2023 +0800 data commit 8e3283724a Author: liuyitao <2371837061@qq.com> Date: Tue Dec 26 19:15:29 2023 +0800 data commit 28555afe1c Author: liuyitao <2371837061@qq.com> Date: Tue Dec 26 10:55:42 2023 +0800 data commit 1fb45b47ad Author: liuyitao <2371837061@qq.com> Date: Tue Dec 26 10:06:01 2023 +0800 aqa commit 8912bcb569 Author: liuyitao <2371837061@qq.com> Date: Thu Dec 21 01:24:30 2023 +0800 a # Conflicts: # doc/实践模板-开源软件泛读.docx # src/Notes-master/.gradle/8.0/checksums/checksums.lock # src/Notes-master/.gradle/8.0/checksums/md5-checksums.bin # src/Notes-master/.gradle/8.0/checksums/sha1-checksums.bin # src/Notes-master/.gradle/8.0/executionHistory/executionHistory.bin # src/Notes-master/.gradle/8.0/executionHistory/executionHistory.lock # src/Notes-master/.gradle/8.0/fileHashes/fileHashes.bin # src/Notes-master/.gradle/8.0/fileHashes/fileHashes.lock # src/Notes-master/.gradle/8.0/fileHashes/resourceHashesCache.bin # src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock # src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin # src/Notes-master/.gradle/file-system.probe # src/Notes-master/.idea/deploymentTargetDropDown.xml # src/Notes-master/app/build/intermediates/apk/debug/app-debug.apk # src/Notes-master/app/build/intermediates/compile_app_classes_jar/debug/classes.jar # src/Notes-master/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex # src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debug/out # src/Notes-master/app/build/intermediates/dex_archive_input_jar_hashes/debugAndroidTest/out # src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties # src/Notes-master/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml # src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties # src/Notes-master/app/build/intermediates/incremental/debug/packageDebugResources/merger.xml # src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/compile-file-map.properties # src/Notes-master/app/build/intermediates/incremental/debugAndroidTest/mergeDebugAndroidTestResources/merger.xml # src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestAssets/merger.xml # src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestJniLibFolders/merger.xml # src/Notes-master/app/build/intermediates/incremental/mergeDebugAndroidTestShaders/merger.xml # src/Notes-master/app/build/intermediates/incremental/mergeDebugAssets/merger.xml # src/Notes-master/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml # src/Notes-master/app/build/intermediates/incremental/mergeDebugShaders/merger.xml # src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # src/Notes-master/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources # src/Notes-master/app/build/intermediates/incremental/packageDebugAndroidTest/tmp/debugAndroidTest/dex-renamer-state.txt # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Contact.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$CallNote.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$DataConstants.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes$TextNote.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/Notes.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesDatabaseHelper.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/data/NotesProvider.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/MetaData.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Node.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlData.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/SqlNote.class # src/Notes-master/app/build/intermediates/javac/debug/classes/net/micode/notes/gtask/data/Task.class # src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt # src/Notes-master/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt # src/Notes-master/app/build/intermediates/merged_res/debug/raw-zh-rCN_introduction.flat # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json # src/Notes-master/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json # src/Notes-master/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$CallNote.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$DataConstants.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes$TextNote.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Notes.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/MetaData.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Node.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlData.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/SqlNote.dex # src/Notes-master/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/data/Task.dex # src/Notes-master/app/build/intermediates/source_set_path_map/debug/file-map.txt # src/Notes-master/app/build/intermediates/source_set_path_map/debugAndroidTest/file-map.txt # src/Notes-master/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk # src/Notes-master/app/build/outputs/logs/manifest-merger-debug-report.txt # src/Notes-master/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin # src/Notes-master/app/src/main/java/net/micode/notes/data/Contact.java # src/Notes-master/app/src/main/java/net/micode/notes/data/Notes.java # src/Notes-master/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java # src/Notes-master/app/src/main/java/net/micode/notes/data/NotesProvider.java # src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/MetaData.java # src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Node.java # src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlData.java # src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/SqlNote.java # src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/Task.java # src/Notes-master/app/src/main/java/net/micode/notes/gtask/data/TaskList.java # src/Notes-master/local.properties		2 years ago
..
stash-dir	Squashed commit of the following:	2 years ago