Labels Milestones

第一版（泛读报告，部分精读报告） #18

Merged

ppu9cqlvf merged 44 commits from dev into master 3 years ago

Conversation 0 Commits 44 Files Changed 101

ppu9cqlvf commented 3 years ago

Owner

合并

合并

ppu9cqlvf added 44 commits 3 years ago

c2eee3fd14 1233

0f508f430f 1

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

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

884a9d5cd3 1

00003aa942 Squashed commit of the following: ...

commit 6a8ecb3766
Merge: 9de2f49 8a4e196
Author: ppu9cqlvf <1329310186@qq.com>
Date:   Fri Mar 31 16:49:07 2023 +0800

    Merge pull request '1' (#4) from 胡逸飞_branch into dev

commit 8a4e1969c2
Author: Dragonshout <1551759347@qq.com>
Date:   Fri Mar 31 16:46:30 2023 +0800

    q

commit 6c244024de
Author: Dragonshout <1551759347@qq.com>
Date:   Fri Mar 31 16:44:33 2023 +0800

    q

commit 9de2f49018
Merge: c223322 b21a860
Author: ppu9cqlvf <1329310186@qq.com>
Date:   Fri Mar 31 16:43:44 2023 +0800

    Merge pull request '1' (#2) from 胡逸飞_branch into dev

commit b21a86034a
Author: Dragonshout <1551759347@qq.com>
Date:   Fri Mar 31 16:42:05 2023 +0800

    1

commit 9042b37767
Merge: fc8b3e5 680954e
Author: Dragonshout <1551759347@qq.com>
Date:   Fri Mar 31 16:32:15 2023 +0800

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

commit c22332223a
Author: Dragonshout <1551759347@qq.com>
Date:   Fri Mar 31 16:22:04 2023 +0800

    1

a6886f4369 Merge branch 'dev' of https://bdgit.educoder.net/ppu9cqlvf/gitProject into 王俊龙_branch ...

# Conflicts:
#	doc/实践一/第一次实践分工.txt
#	src/Notes-master3/.gradle/7.5/checksums/checksums.lock
#	src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin
#	src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin
#	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/.idea/gradle.xml
#	src/Notes-master3/.idea/misc.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/debug/raw-zh-rCN_introduction.flat
#	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

1e9a488f4d 提交

d6a60052ff Merge branch 'dev' of https://bdgit.educoder.net/ppu9cqlvf/gitProject into 王俊龙_branch ...

# Conflicts:
#	doc/实践一/第一次实践分工.txt
#	src/Notes-master3/.gradle/7.5/checksums/checksums.lock
#	src/Notes-master3/.gradle/7.5/checksums/md5-checksums.bin
#	src/Notes-master3/.gradle/7.5/checksums/sha1-checksums.bin
#	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/.idea/gradle.xml
#	src/Notes-master3/.idea/misc.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/debug/raw-zh-rCN_introduction.flat
#	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

0fb91c0ac6 11

fed5f6d243 Merge pull request '1' (#9) from 胡逸飞_branch into dev

f88f04b46e 1

a799a0ed5c Merge branch 'dev' of https://bdgit.educoder.net/ppu9cqlvf/gitProject into 王俊龙_branch ...

# Conflicts:
#	doc/实践一/第一次实践分工.txt

a97a7989a9 1

50e2041a72 1

669c05fe8d Merge remote-tracking branch 'remotes/origion/dev' into dev ...

# Conflicts:
#	doc/实践一/第一次实践分工.txt

bfe2281909 1

690359d5e5 Merge branch 'dev' of https://bdgit.educoder.net/ppu9cqlvf/gitProject into 王俊龙_branch ...

# Conflicts:
#	doc/实践一/第一次实践分工.txt

266ab335bc Merge branch '王俊龙_branch' of https://bdgit.educoder.net/ppu9cqlvf/gitProject into 王俊龙_branch ...

# Conflicts:
#	doc/实践一/新建文本文档.txt

15308af67e Merge pull request '1' (#12) from 王俊龙_branch into dev

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

# Conflicts:
#	doc/泛读报告.docx

fc5818c8e6 1 ...

1

b606f10b65 1

2ddc7bbb76 1

d0572aad53 1

0b35071c3c 1

5fa1677ffa 1

66a4be0e28 1

f8a2996501 1

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

# Conflicts:
#	doc/实践一/第一次实践分工.txt

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

118ddf6b07 1

3accc9391c Merge pull request '1' (#14) from 王志成_branch into dev

66d5e8aa98 1

1022ee2031 Merge branch 'dev' of https://bdgit.educoder.net/ppu9cqlvf/gitProject into dev ...

# Conflicts:
#	src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock
#	src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock
#	src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	src/Notes-master3/.gradle/file-system.probe

d4319b99d2 1

288fea571f 精读

925d3bbfae 1

ddcadb84b3 泛读报告.docx

d17d096954 Merge branch 'dev' of https://bdgit.educoder.net/ppu9cqlvf/gitProject into 王俊龙_branch ...

# Conflicts:
#	src/Notes-master3/.gradle/7.5/executionHistory/executionHistory.lock
#	src/Notes-master3/.gradle/7.5/fileHashes/fileHashes.lock
#	src/Notes-master3/.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	src/Notes-master3/.gradle/file-system.probe

289da42963 1 ...

1

3d8d495981 泛读报告.docx

80c6d33cd7 Merge branch 'dev' of https://bdgit.educoder.net/ppu9cqlvf/gitProject into dev

9a3a73ae63 1

ppu9cqlvf merged commit 0bbbf5b8ff into master 3 years ago

The pull request has been merged as 0bbbf5b8ff.

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#18

Write Preview

Loading…

Cancel

Save

There is no content yet.