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.
master
DongWeiCheng_branch
ChiYanZhen_branch
ZhengHaoYuan_branch
develop
LiuFuLuo_branch
${ noResults }
# Conflicts: # src/.gradle/7.3.3/executionHistory/executionHistory.bin # src/.gradle/7.3.3/executionHistory/executionHistory.lock # src/.gradle/7.3.3/fileHashes/fileHashes.bin # src/.gradle/7.3.3/fileHashes/fileHashes.lock # src/.gradle/buildOutputCleanup/buildOutputCleanup.lock # src/.gradle/file-system.probe # src/.idea/workspace.xml # src/Notes1/app/build/intermediates/merged_res/debug/values_values.arsc.flat # src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/debug.json # src/Notes1/app/build/intermediates/merged_res_blame_folder/debug/out/multi-v2/values.json # src/Notes1/app/build/intermediates/processed_res/debug/out/resources-debug.ap_ # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask$1.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskManager.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/AlarmAlertActivity.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/DateTimePicker.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter$FolderListItem.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$1.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$2.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$3.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$4.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$5.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$7.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$8.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$BackgroundQueryHandler.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$1.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback$2.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ModeCallback.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$1.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$GTaskReceiver.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_2x.dex # src/Notes1/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/widget/NoteWidgetProvider_4x.dex # src/Notes1/app/src/main/res/values/strings.xml # src/Notes1/app/src/main/res/values/styles.xml # src/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex # src/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties # src/app/build/intermediates/incremental/debug/mergeDebugResources/merger.xml # src/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt # src/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources # src/app/build/intermediates/project_dex_archive/debug/out/6be87a94442d2b8afadf938b2d2a05d2859a1208729216b9bf0c454c5fca49e1_5.jar # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/Contact.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesDatabaseHelper$TABLE.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/data/NotesProvider.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/gtask/remote/GTaskASyncTask.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/Note.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/model/WorkingNote.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/BackupUtils$TextExport.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/DataUtils.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/tool/ResourceParser.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/FoldersListAdapter.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$1.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$2.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$3.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity$HeadViewHolder.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditActivity.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NoteEditText.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$6.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$9.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$ListEditState.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$NewNoteOnTouchListener.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity$OnListItemClickListener.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListActivity.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListAdapter.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesListItem.dex # src/app/build/intermediates/project_dex_archive/debug/out/net/micode/notes/ui/NotesPreferenceActivity$4.dex # src/app/build/intermediates/signing_config_versions/debug/signing-config-versions.json |
3 years ago | |
---|---|---|
doc | docment | 3 years ago |
src | Merge branch 'master' of https://bdgit.educoder.net/mvbayc8qt/new_MiCode | 3 years ago |
README.md | Initial commit | 3 years ago |