Labels Milestones

1 #34

Merged

ppu9cqlvf merged 20 commits from dev into master 3 years ago

Conversation 0 Commits 20 Files Changed 148

ppu9cqlvf commented 3 years ago

Owner

There is no content yet.

ppu9cqlvf added 20 commits 3 years ago

59c3a94f4e 123

cf1ac58db0 1

f0f7c73e21 Merge branch 'dev' of https://bdgit.educoder.net/ppu9cqlvf/gitProject into 胡逸飞_branch

fc6c397b4d 1 ...

1

7ebd09ef1b 1

4342257a7a Merge branch 'dev' of https://bdgit.educoder.net/ppu9cqlvf/gitProject into 王志成_branch ...

# Conflicts:
#	src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin
#	src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock
#	src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin
#	src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock
#	src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin
#	src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin
#	src/Notes-master3/.gradle/file-system.probe
#	src/Notes-master3/.idea/deploymentTargetDropDown.xml
#	src/Notes-master3/app/build/intermediates/apk/debug/app-debug.apk
#	src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
#	src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
#	src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
#	src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
#	src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
#	src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
#	src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
#	src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
#	src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
#	src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
#	src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
#	src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
#	src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
#	src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt
#	src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk
#	src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt
#	src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
#	src/Notes-master3/local.properties

aa404f1e22 1111

7587c7ce91 1 ...

1

0fdd2ea064 1

5427f0aa2c 1

f17496be5c Merge branch 'dev' of https://bdgit.educoder.net/ppu9cqlvf/gitProject into 胡逸飞_branch ...

# Conflicts:
#	src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.bin
#	src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock
#	src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.bin
#	src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock
#	src/Notes-master3/.gradle/7.5/fileHashes/resourceHashesCache.bin
#	src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	src/Notes-master3/.gradle/buildOutputCleanup/outputFiles.bin
#	src/Notes-master3/.gradle/file-system.probe
#	src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_0/graph.bin
#	src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_1/graph.bin
#	src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_2/graph.bin
#	src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_3/graph.bin
#	src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_4/graph.bin
#	src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_5/graph.bin
#	src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_6/graph.bin
#	src/Notes-master3/app/build/intermediates/desugar_graph/debug/out/currentProject/dirs_bucket_7/graph.bin
#	src/Notes-master3/app/build/intermediates/dex_archive_input_jar_hashes/debug/out
#	src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties
#	src/Notes-master3/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml
#	src/Notes-master3/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
#	src/Notes-master3/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
#	src/Notes-master3/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
#	src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	src/Notes-master3/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
#	src/Notes-master3/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
#	src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json
#	src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rCN.json
#	src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values-zh-rTW.json
#	src/Notes-master3/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json
#	src/Notes-master3/app/build/intermediates/processed_res/debug/out/resources-debug.ap_
#	src/Notes-master3/app/build/intermediates/project_dex_archive/debug/out/3b39a0f8c9a74077ddf9126288e67b5aee0b290a2f74293e2d6f45ae0690b824_5.jar
#	src/Notes-master3/app/build/intermediates/source_set_path_map/debug/file-map.txt
#	src/Notes-master3/app/build/outputs/apk/debug/app-debug.apk
#	src/Notes-master3/app/build/outputs/logs/manifest-merger-debug-report.txt
#	src/Notes-master3/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin
#	src/Notes-master3/local.properties

4a41f1b439 1

bc25332a04 分工发布

005b6fe726 1

5b22b9ff69 Merge branch 'dev' of https://bdgit.educoder.net/ppu9cqlvf/gitProject into 胡逸飞_branch

8f933cc3bb 1

cc5ab3a94f 收到 ...

收到

daaf23cc21 收到 ...

收到

05dd6177e3 12

cf255df254 1 ...

1

ppu9cqlvf merged commit 912124f9b6 into master 3 years ago

The pull request has been merged as 912124f9b6.

Sign in to join this conversation.

Reviewers

Request review

No reviewers

Labels

Apply labels

Clear labels

No items

No Label

Milestone

Set milestone

Clear milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Assign users

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: ppu9cqlvf/gitProject#34

Write Preview

Loading…

Cancel

Save

There is no content yet.