3 Commits (320645f7c2afd402d5e20c5a1b318a2cb9be0f49)

Author	SHA1	Message	Date
yhz	320645f7c2	Merge branch '于昊正' of https://bdgit.educoder.net/p2cafumxo/5._Open-source-software-reading-annotation ... # Conflicts: # src/data/Contact.java # src/data/Notes.java # src/data/NotesDatabaseHelper.java # src/ui/AlarmAlertActivity.java # src/ui/AlarmInitReceiver.java # src/ui/AlarmReceiver.java # src/ui/DateTimePicker.java # src/ui/DateTimePickerDialog.java # src/ui/DropdownMenu.java # src/ui/FoldersListAdapter.java # src/ui/NoteEditActivity.java # src/ui/NoteEditText.java # src/ui/NoteItemData.java # src/ui/NoteWidgetProvider.java # src/ui/NotesListActivity.java # src/ui/NotesListAdapter.java # src/ui/NotesListItem.java # src/ui/NotesPreferenceActivity.java	11 months ago
p2cafumxo	60c2fcd545	Delete 'src/GTaskStringUtils.java'	11 months ago
zpz1349878361	56bdf6ce08	小组代码	11 months ago