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.

cyx13 8c27436e4d Merge remote-tracking branch 'origin/cyx_branch' into cyx_branch ... # Conflicts: # src/app/src/main/java/net/micode/notes/widget/NoteWidgetProvider.java		2 years ago
..
debug/mergeDebugResources	Merge remote-tracking branch 'origin/cyx_branch' into cyx_branch	2 years ago
debug-mergeJavaRes	Merge remote-tracking branch 'origin/cyx_branch' into cyx_branch	2 years ago
mergeDebugAssets	Merge remote-tracking branch 'origin/cyx_branch' into cyx_branch	2 years ago
mergeDebugJniLibFolders	Merge remote-tracking branch 'origin/cyx_branch' into cyx_branch	2 years ago
mergeDebugShaders	Merge remote-tracking branch 'origin/cyx_branch' into cyx_branch	2 years ago
packageDebug/tmp/debug	Merge remote-tracking branch 'origin/cyx_branch' into cyx_branch	2 years ago
processDebugResources	Merge remote-tracking branch 'origin/cyx_branch' into cyx_branch	2 years ago