zhoushiyi_gitpro fdba863c4c Merge branch 'master' of https://bdgit.educoder.net/pfqs8cjuk/gitProject ... # Conflicts: # other/06_标注/210340013_李赫桐_代码标注/BackupUtils.java # other/06_标注/210340013_李赫桐_代码标注/DataUtils.java # other/06_标注/210340013_李赫桐_代码标注/GTaskStringUtils.java # other/06_标注/210340013_李赫桐_代码标注/Note.java # other/06_标注/210340013_李赫桐_代码标注/ResourceParser.java # other/06_标注/210340013_李赫桐_代码标注/WorkingNote.java # other/06_标注/210340013_李赫桐_代码标注/widget.java # other/06_标注/210340024_阮钰琳_代码标注/FoldersListAdapter.doc # other/06_标注/210340024_阮钰琳_代码标注/FoldersListAdapter.java # other/06_标注/210340024_阮钰琳_代码标注/NoteEditActivity.doc # other/06_标注/210340024_阮钰琳_代码标注/NoteEditActivity.java # other/06_标注/210340024_阮钰琳_代码标注/NoteEditText.doc # other/06_标注/210340024_阮钰琳_代码标注/NoteEditText.java # other/06_标注/210340024_阮钰琳_代码标注/NoteItemData.doc # other/06_标注/210340024_阮钰琳_代码标注/NoteItemData.java # other/06_标注/210340024_阮钰琳_代码标注/NotesListActivity.doc # other/06_标注/210340024_阮钰琳_代码标注/NotesListActivity.java # other/06_标注/210340024_阮钰琳_代码标注/NotesListAdapter.doc # other/06_标注/210340024_阮钰琳_代码标注/NotesListAdapter.java # other/06_标注/210340041_郑培萱_代码标注/AlarmAlertActivity.java # other/06_标注/210340041_郑培萱_代码标注/AlarmInitReceiver.java # other/06_标注/210340041_郑培萱_代码标注/AlarmReceiver.java # other/06_标注/210340041_郑培萱_代码标注/DateTimePicker.java # other/06_标注/210340041_郑培萱_代码标注/DateTimePickerDialog.java # other/06_标注/210340041_郑培萱_代码标注/DropdownMenu.java # other/06_标注/210340041_郑培萱_代码标注/FoldersListAdapter.java # other/06_标注/210340041_郑培萱_代码标注/NotesListItem.java # other/06_标注/210340041_郑培萱_代码标注/NotesPreferenceActivity.java # other/06_标注/210340042-周施怡_代码标注/ActionFailureException.java # other/06_标注/210340042-周施怡_代码标注/GTaskASyncTask.java # other/06_标注/210340042-周施怡_代码标注/GTaskClient.java # other/06_标注/210340042-周施怡_代码标注/MetaData.java # other/06_标注/210340042-周施怡_代码标注/NetworkFailureException.java # other/06_标注/210340042-周施怡_代码标注/Node.java # other/06_标注/210340042-周施怡_代码标注/SqlData.java # other/06_标注/210340042-周施怡_代码标注/SqlNote.java # other/06_标注/210340042-周施怡_代码标注/Task.java # other/06_标注/210340042-周施怡_代码标注/TaskList.java # other/06_标注/210340044_左丹妮_代码标注/Contact.docx # other/06_标注/210340044_左丹妮_代码标注/Contact.java # other/06_标注/210340044_左丹妮_代码标注/Data_Notes_NoteColumns.jpg # other/06_标注/210340044_左丹妮_代码标注/GTaskManager.docx # other/06_标注/210340044_左丹妮_代码标注/GTaskManager.java # other/06_标注/210340044_左丹妮_代码标注/GTaskSyncService.docx # other/06_标注/210340044_左丹妮_代码标注/GTaskSyncService.java # other/06_标注/210340044_左丹妮_代码标注/Gtask_remote_GTaskMnager.jpg # other/06_标注/210340044_左丹妮_代码标注/Gtask_remote_GTaskMnager_initGTaskList.jpg # other/06_标注/210340044_左丹妮_代码标注/Gtask_remote_GTaskMnager_initGTaskList2.jpg # other/06_标注/210340044_左丹妮_代码标注/Gtask_remote_GTaskMnager_initGTaskList3.jpg # other/06_标注/210340044_左丹妮_代码标注/Gtask_remote_GTaskMnager_syncContent.jpg # other/06_标注/210340044_左丹妮_代码标注/Gtask_remote_GTaskMnager_updateRemoteNodejpg.jpg # other/06_标注/210340044_左丹妮_代码标注/Gtask_remote_GTaskSyncService_onBind.jpg # other/06_标注/210340044_左丹妮_代码标注/Notes.docx # other/06_标注/210340044_左丹妮_代码标注/Notes.java # other/06_标注/210340044_左丹妮_代码标注/NotesDatabaseHelper.docx # other/06_标注/210340044_左丹妮_代码标注/NotesDatabaseHelper.java # other/06_标注/210340044_左丹妮_代码标注/NotesProvider.docx # other/06_标注/210340044_左丹妮_代码标注/NotesProvider.java		2 years ago
..
01_周施怡_泛读报告.docx	提交实验材料	2 years ago
02_周施怡_质量分析报告.docx	提交实验材料	2 years ago
03_周施怡_维护需求与设计方案.docx	提交实验材料	2 years ago
~$_周施怡_维护需求与设计方案.docx	提交实验材料	2 years ago