xuningshuo_branch
master
新增了保存并退出、返回上一级、回收站三个功能
# Conflicts: # java/net/micode/notes/data/NotesDatabaseHelper.java # java/net/micode/notes/model/WorkingNote.java # src/data/Contact.java # src/data/Notes.java # src/gtask/remote/GTaskASyncTask.java # src/gtask/remote/GTaskManager.java
9a15ef0d2d
No due date set.
No dependencies set.
Deleting a branch is permanent. It CANNOT be undone. Continue?
新增了保存并退出、返回上一级、回收站三个功能
9a15ef0d2dinto master 4 weeks ago9a15ef0d2d.