将main合并到ZZY分支 #33

Closed

pzgqwaxsf wants to merge 0 commits from main into ZZY_branch

pzgqwaxsf commented

Collaborator

There is no content yet.

pzgqwaxsf added 230 commits

a340446de8 Yaoi

339925b5e9 Yaoi

fc742489b5 Yaoi

8da1d6ed28 Yaoi

c908b4567f Yaoi

def8108b8a Yaoi

640ac7d5af Yaoi

94b38ae827 Yaoi

f72cd80c0a Yaoi

391196b74c Yaoi

14c41c441a Yaoi

fd7bf6d977 Yaoi

d7d3ce7263 Yaoi

e8eb763b18 Yaoi

ae5dab9836 Yaoi

ff6becacb4 Yaoi

b3b3a1f964 Yaoi

e1bb2bdca5 Yaoi

a4c97921f4 Yaoi

10fe0037e1 Yaoi

e5d497344f Yaoi

6a39d81c53 Delete 'src/Note-master'

3ebbc379b1 ADD file via upload

3a000ca62b ADD file via upload

79ddb00bee Delete 'src/Notes-master/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock'

217339ec5f 删除 'src%2FNotes-master%2F.gradle%2F7.2%2Fdependencies-accessors/gc.properties'

b3a5235532 Yaoi

2364154f76 ADD file via upload

b17ec4d58c ADD file via upload

5bf900c614 ADD file via upload

2995e8596e ADD file via upload

772ec8a269 ADD file via upload

f41223b2fa ADD file via upload

7268108912 删除 'src/FNotes-master/.gradle/7.2/fileHashes/fileHashes.bin'

eedc34cb19 删除 'src/Notes-master/.gradle/7.2/executionHistory'

3ee9a9e487 删除 'src/Notes-master/.gradle/7.2/executionHistory.lock'

b87180b69b ADD file via upload

e0f5b2a45d ADD file via upload

51835e614a 删除 'src/Notes-master/.gradle/7.2/FexecutionHistory/executionHistory.lock'

197a4e0f4b ADD file via upload

cdee1bfab3 ADD file via upload

cb59b7174f ADD file via upload

3c211fbc6e ADD file via upload

b65bfe6d42 ADD file via upload

3566fd6a6e ADD file via upload

40eb6e4a75 ADD file via upload

69a6e7c028 ADD file via upload

5d31498fc8 ADD file via upload

3ecf37703b ADD file via upload

a98faef072 ADD file via upload

b8e47753a9 ADD file via upload

fcea4e642a ADD file via upload

a61c000aa8 ADD file via upload

65124ac8ca ADD file via upload

4903287771 删除 'src/Notes-maste/.idea/libraries/Gradle__androidx_annotation_annotation_1_2_0.xml'

9503dfcb1a ADD file via upload

b9558ebb46 ADD file via upload

9693d4d78b ADD file via upload

dcdcd7cba3 ADD file via upload

845439471c ADD file via upload

58b9037c20 ADD file via upload

8e442aebea ADD file via upload

a2e54d729b ADD file via upload

b10d6f8781 ADD file via upload

e751769774 ADD file via upload

7c0b96ef3e ADD file via upload

bfd9edbfe1 ADD file via upload

8062dc6d2b ADD file via upload

19ef3f3a5f ADD file via upload

b41da94314 ADD file via upload

330be16138 ADD file via upload

532f73000c ADD file via upload

a0755f0671 ADD file via upload

af4491989c ADD file via upload

cdc5f272e8 ADD file via upload

ef5a285cba ADD file via upload

52bdce8340 ADD file via upload

c1978412bd ADD file via upload

205a5c4a71 ADD file via upload

0c46645c7b ADD file via upload

f737c805c3 ADD file via upload

739afda2a6 ADD file via upload

2925ea30e2 ADD file via upload

7bad629a6f ADD file via upload

765e48acd3 ADD file via upload

5747b668a6 ADD file via upload

ce23d49ae5 ADD file via upload

3513c58ada ADD file via upload

7495091f7e ADD file via upload

e8bbd357a7 ADD file via upload

48752e21d6 ADD file via upload

a57a01b961 ADD file via upload

23007f67c2 ADD file via upload

e17f0e8114 ADD file via upload

a40ea9f767 ADD file via upload

53a9043ca0 ADD file via upload

862a812bd1 ADD file via upload

8ca69c5cad ADD file via upload

51b43c03da ADD file via upload

76280880b4 ADD file via upload

59f0185ad7 ADD file via upload

026cb44ed4 ADD file via upload

e9cbf9a32f ADD file via upload

0f3306fbd7 ADD file via upload

29ca9d811c ADD file via upload

7e1018d9a8 ADD file via upload

dafbf43eb1 ADD file via upload

e54d2e62bd ADD file via upload

7b25a044ad ADD file via upload

84cecafd87 ADD file via upload

db13d0f76f ADD file via upload

0eec47f462 ADD file via upload

04ee9692d1 ADD file via upload

0b0c132dfa ADD file via upload

927ad88166 ADD file via upload

fe68da16f0 ADD file via upload

7866e7a6a6 ADD file via upload

1e1bb59902 ADD file via upload

be787a6b2d ADD file via upload

05eea0ef98 ADD file via upload

7afec093d9 ADD file via upload

fc18761580 ADD file via upload

f440bf9f7a ADD file via upload

a1649a083c ADD file via upload

0573623e4f ADD file via upload

e9a3e2c781 ADD file via upload

345a49640c ADD file via upload

081b865c18 1

d895e567d4 Yaoi

538c7162c1 Yaoi

489b726a54 ADD file via upload

b91495ed91 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_activity_activity_1_2_3_aar.xml'

47af89d7dd Delete 'src/Notes-master/.gradle/7.2/dependencies-accessors/dependencies-accessors.lock'

d8f2067440 Delete 'src/Notes-master/.gradle/7.2/dependencies-accessors/gc.properties'

30774be5ed Delete 'src/Notes-master/.gradle/7.2/gc.properties'

dc73e5ba0b Delete 'src/Notes-master/.gradle/7.2/fileHashes/fileHashes.bin'

10e9b31979 Delete 'src/Notes-master/.gradle/7.2/fileHashes/fileHashes.lock'

eab496624a Delete 'src/Notes-master/.gradle/7.2/fileHashes/resourceHashesCache.bin'

d6e3da3a87 Delete 'src/Notes-master/.gradle/7.2/executionHistory/executionHistory.bin'

d1d4c06878 Delete 'src/Notes-master/.gradle/7.2/executionHistory/executionHistory.lock'

560eca3853 Delete 'src/Notes-master/.gradle/7.2/fileChanges/last-build.bin'

4047762f8c Delete 'src/Notes-master/.gradle/buildOutputCleanup/buildOutputCleanup.lock'

36af0cb85e Delete 'src/Notes-master/.gradle/buildOutputCleanup/cache.properties'

7e51e592aa Delete 'src/Notes-master/.gradle/buildOutputCleanup/outputFiles.bin'

5ac751fdb2 Delete 'src/Notes-master/.gradle/checksums/checksums.lock'

8aba91aca7 Delete 'src/Notes-master/.gradle/checksums/md5-checksums.bin'

011d09e028 Delete 'src/Notes-master/.gradle/checksums/sha1-checksums.bin'

fed85c6b2a Delete 'src/Notes-master/.gradle/vcs-1/gc.properties'

0e7ab65423 Delete 'src/Notes-master/.idea/Flibraries/Gradle__androidx_arch_core_core_runtime_2_1_0_aar.xml'

ac6fc485d8 删除 'src/Notes-master/.idea/libraries/Gradle__androidx_activity_activity_1_2_3_aar.xml'

5191d9e324 Yaoi

ea8ffe9566 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_annotation_annotation_1_2_0.xml'

e2e7166296 Delete 'src/Notes-master/app/build/generated/data_binding_base_class_source_out/debug/out/net/micode/notes/databinding/AddAccountTextBinding.java'

633f1af5c9 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_annotation_annotation_experimental_1_0_0_aar.xml'

346fc3d55c Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_3_0_aar.xml'

d56e93cbb1 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_appcompat_appcompat_resources_1_3_0_aar.xml'

01a9a5157c Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_arch_core_core_common_2_1_0.xml'

34a4419df7 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml'

dac8c56c9a Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_cardview_cardview_1_0_0_aar.xml'

f06008cd90 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_collection_collection_1_1_0.xml'

24bc7b1cd9 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_2_0_4_aar.xml'

c9a567563a Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_2_0_4.xml'

8a7ca0e13b Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_1_0_aar.xml'

ca7384eb9d Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_core_core_1_5_0_aar.xml'

f8a6abc8f1 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml'

9d596437e0 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml'

fc2e8effc4 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_databinding_viewbinding_7_0_2_aar.xml'

20d766de1a Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml'

6330a4687b Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml'

5e821cc9f5 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_dynamicanimation_dynamicanimation_1_0_0_aar.xml'

210b3e99da Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_fragment_fragment_1_3_4_aar.xml'

aecaebd26f Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml'

6fe6185959 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml'

8f3184aba4 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_3_1.xml'

02df2eee1c Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml'

2cbe1ac8dd Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_3_1_aar.xml'

374590c187 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_3_1_aar.xml'

bf398b9699 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_3_1_aar.xml'

ed71f29f28 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_savedstate_2_3_1_aar.xml'

fa7ab397ec Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml'

82737a8093 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml'

4c76e1d4bc Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml'

cfc59d2d23 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_recyclerview_recyclerview_1_1_0_aar.xml'

9204bf965c Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_savedstate_savedstate_1_1_0_aar.xml'

fad1d35fc2 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_test_core_1_4_0_aar.xml'

042493d8a0 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_4_0_aar.xml'

297e2ec040 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_4_0_aar.xml'

420f9796bf Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_test_ext_junit_1_1_3_aar.xml'

57cdc98871 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_test_monitor_1_4_0_aar.xml'

a8ce56c8a8 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_test_runner_1_4_0_aar.xml'

478dcd585a Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_test_services_storage_1_4_0_aar.xml'

d4a2e744e8 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_transition_transition_1_2_0_aar.xml'

6fba046c28 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_1_0_aar.xml'

050b3d1fb1 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_1_0_aar.xml'

8254f0954d Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_1_1_aar.xml'

2297a63b2e Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_viewpager2_viewpager2_1_0_0_aar.xml'

a245dbd772 Delete 'src/Notes-master/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml'

f9fb1f5a1e Delete 'src/Notes-master/.idea/libraries/Gradle__com_android_support_support_annotations_22_0_0.xml'

7c3d116a01 Delete 'src/Notes-master/.idea/libraries/Gradle__com_google_android_material_material_1_4_0_aar.xml'

9e6e0b7f87 Delete 'src/Notes-master/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_1_3_9.xml'

055ce72c52 Delete 'src/Notes-master/.idea/libraries/Gradle__com_google_firebase_firebase_crashlytics_buildtools_2_7_1.xml'

e00de5a4c1 Delete 'src/Notes-master/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1.xml'

087ffd02f8 Delete 'src/Notes-master/.idea/libraries/Gradle__javax_inject_javax_inject_1.xml'

a1273694dd Delete 'src/Notes-master/.idea/libraries/Gradle__junit_junit_4_12.xml'

1aa746de64 Delete 'src/Notes-master/.idea/libraries/Gradle__junit_junit_4_13_2.xml'

f5179a4410 Delete 'src/Notes-master/.idea/libraries/Gradle__org_apache_http_legacy.xml'

3db4623132 Delete 'src/Notes-master/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3.xml'

937c629ba6 Delete 'src/Notes-master/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3.xml'

719dbe2e44 Delete 'src/Notes-master/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3.xml'

6308603072 Delete 'src/Notes-master/.idea/modules/app/Mynotes.app.iml'

3d1beecadd Delete 'src/Notes-master/.idea/modules/Mynotes.iml'

09fa2b7645 Delete 'src/Notes-master/.idea/sonarlint/securityhotspotstore/index.pb'

90b5d3f29e Delete 'src/Notes-master/.idea/.gitignore'

d7d92163f0 Delete 'src/Notes-master/.idea/.name'

d94360a81d Delete 'src/Notes-master/.idea/checkstyle-idea.xml'

e4f009886e Delete 'src/Notes-master/.idea/compiler.xml'

f477023d8c Delete 'src/Notes-master/.idea/deploymentTargetDropDown.xml'

d923ee8b97 Delete 'src/Notes-master/.idea/gradle.xml'

5765c44aad Delete 'src/Notes-master/.idea/jarRepositories.xml'

b07e1ca464 Delete 'src/Notes-master/.idea/misc.xml'

a3a4d6c388 Delete 'src/Notes-master/.idea/modules.xml'

4c1e80a07a Delete 'src/Notes-master/.idea/vcs.xml'

34cb6fd77c Delete 'src/Notes-master/.idea/workspace.xml'

5abd419e2e 删除 'src/Notes-master.z01'

9f3611c6d9 删除 'src/Notes-master.zip'

80a3135aa7 Yaoi

4a17e165c6 Merge pull request '合并Main至梅诗睿分支' (#31 ) from main into MSR_branch

101cb4bb09 ADD file via upload

0ac95929e6 ADD file via upload

4065512d3d Merge pull request '梅诗睿总结报告+精读报告' (#32 ) from MSR_branch into main

pzgqwaxsf changed title from ~~将main合并到张之阳~~ to 将main合并到ZZY分支

pzgqwaxsf closed this pull request

This pull request cannot be reopened because the branch was deleted.

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: pyg8ivf7o/MiCode#33