Merge branch 'master' of https://bdgit.educoder.net/pn5zu9fp6/git

Browse Source

# Conflicts:
#	src/notes/data/Contact.java
#	src/notes/data/Notes.java
#	src/notes/data/NotesDatabaseHelper.java
#	src/notes/data/NotesProvider.java
#	src/notes/gtask/data/MetaData.java
#	src/notes/gtask/data/Node.java
#	src/notes/gtask/data/SqlData.java
#	src/notes/gtask/data/SqlNote.java
#	src/notes/gtask/data/Task.java
#	src/notes/gtask/data/TaskList.java
#	src/notes/gtask/exception/ActionFailureException.java
#	src/notes/gtask/exception/NetworkFailureException.java
#	src/notes/gtask/remote/GTaskASyncTask.java
#	src/notes/gtask/remote/GTaskClient.java
#	src/notes/gtask/remote/GTaskManager.java
#	src/notes/gtask/remote/GTaskSyncService.java
#	src/notes/model/Note.java
#	src/notes/model/WorkingNote.java
#	src/notes/tool/BackupUtils.java
#	src/notes/tool/DataUtils.java
#	src/notes/tool/GTaskStringUtils.java
#	src/notes/tool/ResourceParser.java
#	src/notes/ui/AlarmAlertActivity.java
#	src/notes/ui/AlarmInitReceiver.java
#	src/notes/ui/AlarmReceiver.java
#	src/notes/ui/DateTimePicker.java
#	src/notes/ui/DateTimePickerDialog.java
#	src/notes/ui/DropdownMenu.java
#	src/notes/ui/FoldersListAdapter.java
#	src/notes/ui/NoteEditActivity.java
#	src/notes/ui/NoteEditText.java
#	src/notes/ui/NoteItemData.java
#	src/notes/ui/NotesListActivity.java
#	src/notes/ui/NotesListAdapter.java
#	src/notes/ui/NotesListItem.java
#	src/notes/ui/NotesPreferenceActivity.java
#	src/notes/widget/NoteWidgetProvider.java
#	src/notes/widget/NoteWidgetProvider_2x.java
#	src/notes/widget/NoteWidgetProvider_4x.java

pull/3/head

FLY 3 years ago

parent 9fc8ec69bc 9f9e57bce6

commit f5bbe97382

1 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

BIN

doc/实践资源-小米便签开源代码的泛读报告模板.docx

View File

Binary file not shown.

Write Preview

Loading…

Cancel

Save