You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Surponess a4c169eb3a Merge branch 'master' of https://bdgit.educoder.net/p82feo7wg/MiNoteRead into wangjiaqi_branch ... # Conflicts: # src/Notes-master/res/menu/note_list.xml # src/Notes-master/src/net/micode/notes/data/Notes.java # src/Notes-master/src/net/micode/notes/model/WorkingNote.java # src/Notes-master/src/net/micode/notes/ui/NoteItemData.java # src/Notes-master/src/net/micode/notes/ui/NotesListActivity.java		2 months ago
..
Notes-master	Merge branch 'master' of https://bdgit.educoder.net/p82feo7wg/MiNoteRead into wangjiaqi_branch	2 months ago