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.

dszubf 1a5b845254 Merge branch 'gengchangzhen' ... # Conflicts: # src/net/micode/notes/data/Contact.java # src/net/micode/notes/data/Notes.java # src/net/micode/notes/data/NotesDatabaseHelper.java # src/net/micode/notes/data/NotesProvider.java # src/net/micode/notes/gtask/data/MetaData.java # src/net/micode/notes/gtask/data/Node.java # src/net/micode/notes/gtask/data/SqlData.java # src/net/micode/notes/gtask/data/SqlNote.java # src/net/micode/notes/gtask/data/Task.java # src/net/micode/notes/gtask/data/TaskList.java # src/net/micode/notes/gtask/exception/ActionFailureException.java # src/net/micode/notes/gtask/exception/NetworkFailureException.java # src/net/micode/notes/gtask/remote/GTaskASyncTask.java # src/net/micode/notes/gtask/remote/GTaskClient.java # src/net/micode/notes/gtask/remote/GTaskManager.java # src/net/micode/notes/gtask/remote/GTaskSyncService.java		7 months ago
doc	4	7 months ago
src/net/micode/notes	data gtask 包注释	7 months ago