 庞浩
|
add039a4a1
|
Merge branch 'master' of https://bdgit.educoder.net/mbhvfy6mx/gitProject
# Conflicts:
# app/src/main/java/net/micode/notes/tool/BackupUtils.java
# app/src/main/java/net/micode/notes/tool/DataUtils.java
# app/src/main/java/net/micode/notes/tool/GTaskStringUtils.java
# app/src/main/java/net/micode/notes/tool/ResourceParser.java
# app/src/main/java/net/micode/notes/ui/NotesPreferenceActivity.java
# app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java
# app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_2x.java
# app/src/main/java/net/micode/notes/widget/NoteWidgetProvider_4x.java
# src/.idea/modules/app/minote.app.androidTest.iml
|
3 years ago |
|
庞浩
|
8741dc4cf6
|
统一控制
|
3 years ago |
|
mbhvfy6mx
|
7d312c9c4a
|
Merge pull request '注释代码' (#10) from zxy_branch into master
|
3 years ago |
 邹兴云
|
f1955e5c4a
|
邹兴云注释
|
3 years ago |
|
邹兴云
|
4dd18f2d5c
|
邹兴云注释
|
3 years ago |
|
邹兴云
|
3d803bc080
|
邹兴云注释
|
3 years ago |
|
邹兴云
|
5c27788389
|
邹兴云注释
|
3 years ago |
|
邹兴云
|
d600a5fb23
|
邹兴云注释
|
3 years ago |
|
庞浩
|
ced305cd3b
|
庞浩的注释
|
3 years ago |
|
庞浩
|
f5b025db80
|
庞浩的注释
|
3 years ago |
|
庞浩
|
4ad8e66d2b
|
庞浩的注释
|
3 years ago |
|
庞浩
|
30352f16b0
|
注释
|
3 years ago |
|
庞浩
|
21b28459b6
|
注释
|
3 years ago |
|
mbhvfy6mx
|
225f60584e
|
Merge pull request 'heb' (#9) from master into zxy_branch
|
3 years ago |
|
庞浩
|
66263d260e
|
更新
|
3 years ago |
|
mbhvfy6mx
|
a8dbc2e1d7
|
Merge pull request '注释代码' (#7) from master into zxy_branch
|
3 years ago |
|
mbhvfy6mx
|
b5b286f576
|
Merge pull request 'heb' (#6) from dev into master
|
3 years ago |
|
庞浩
|
80f77bc1c1
|
Merge branch 'dev' of https://bdgit.educoder.net/mbhvfy6mx/gitProject into dev
|
3 years ago |
|
mbhvfy6mx
|
8482c88b75
|
Merge pull request 'heb' (#5) from master into dev
|
3 years ago |
|
mbhvfy6mx
|
414c9b39b4
|
Merge pull request 'heb' (#5) from master into dev
|
3 years ago |
|
庞浩
|
136b4a1591
|
Merge branch 'master' of https://bdgit.educoder.net/mbhvfy6mx/gitProject
|
3 years ago |
|
庞浩
|
846fa8ced2
|
Merge branch 'master' of https://bdgit.educoder.net/mbhvfy6mx/gitProject
|
3 years ago |
|
mbhvfy6mx
|
4cfce06d64
|
Merge pull request 'heb' (#4) from master into zxy_branch
|
3 years ago |
|
mbhvfy6mx
|
f591b2f5d1
|
Merge pull request 'heb' (#2) from master into dev
|
3 years ago |
|
庞浩
|
c5e05a650e
|
Merge branch 'master' of https://bdgit.educoder.net/mbhvfy6mx/gitProject
|
3 years ago |
|
mbhvfy6mx
|
9628a3aede
|
d
|
3 years ago |
|
mbhvfy6mx
|
f6c6c577f2
|
Delete 'model'
|
3 years ago |
|
mbhvfy6mx
|
96bc83e7ca
|
Merge pull request 'heb' (#1) from zxy_branch into master
|
3 years ago |
|
mbhvfy6mx
|
b9f0e1d9fb
|
Add model
|
3 years ago |
|
mbhvfy6mx
|
28211a7d0e
|
Delete 'model'
|
3 years ago |
|
mbhvfy6mx
|
13b2e1cc94
|
Add model
|
3 years ago |
|
mbhvfy6mx
|
f97ade5e05
|
Initial commit
|
3 years ago |
