Merge remote-tracking branch 'origin/SendScreenShotActivity' into SendScreenShotActivity

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_client

Browse code Merge remote-tracking branch 'origin/SendScreenShotActivity' into SendScreenShotActivity # Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/res/layout/activity_send_screen_shot.xml README master
commit 33dcaa500b1c9fc544c3e35aaf765b463954cb73 2 parents f625c59 + ac146b1 t-tai authored on 5 Oct 2021

Patch

Unified Split

Showing 5 changed files

Ignore Space Show notes View .idea/misc.xml

Ignore Space Show notes View app/src/main/AndroidManifest.xml

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/page/PageActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/page/SwipeDirectionType.java 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/activity_paint.xml

Show line notes below