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.

zephyr ad530f9d29 Merge branch 'develop' ... # Conflicts: # Notesmaster/.idea/deploymentTargetSelector.xml # Notesmaster/.idea/gradle.xml # Notesmaster/app/build.gradle.kts # Notesmaster/app/src/main/AndroidManifest.xml # Notesmaster/app/src/main/java/net/micode/notes/data/Notes.java # Notesmaster/app/src/main/java/net/micode/notes/data/NotesDatabaseHelper.java # Notesmaster/app/src/main/java/net/micode/notes/data/NotesProvider.java # Notesmaster/app/src/main/java/net/micode/notes/gtask/data/MetaData.java # Notesmaster/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java # Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmAlertActivity.java # Notesmaster/app/src/main/java/net/micode/notes/ui/AlarmInitReceiver.java # Notesmaster/app/src/main/java/net/micode/notes/ui/DateTimePicker.java # Notesmaster/app/src/main/java/net/micode/notes/ui/DateTimePickerDialog.java # Notesmaster/app/src/main/java/net/micode/notes/ui/DropdownMenu.java # Notesmaster/app/src/main/java/net/micode/notes/ui/FoldersListAdapter.java # Notesmaster/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java # Notesmaster/app/src/main/java/net/micode/notes/ui/NotesListActivity.java # Notesmaster/app/src/main/java/net/micode/notes/ui/NotesListItem.java # Notesmaster/app/src/main/res/layout/note_edit.xml # Notesmaster/app/src/main/res/values/colors.xml # Notesmaster/app/src/main/res/values/strings.xml # Notesmaster/gradle/wrapper/gradle-wrapper.properties		9 months ago
..
.idea	Merge branch 'develop'	9 months ago
app	最终合并	9 months ago
gradle	Initial commit	10 months ago
httpcomponents-client-4.5.14-bin	导入依赖	10 months ago
.gitignore	Initial commit	10 months ago
build.gradle.kts	Initial commit	10 months ago
gradle.properties	Initial commit	10 months ago
gradlew	Initial commit	10 months ago
gradlew.bat	Initial commit	10 months ago
settings.gradle.kts	Initial commit	10 months ago