Merge branch 'master' into #157layout

Fork: 0

nitta-lab-2021 / org.ntlab.acanthus_client

Browse code Merge branch 'master' into #157layout # Conflicts: # app/src/main/res/layout/fragment_edit.xml README master
commit c542f08c4f6c74053173a7f534794ebdd039e125 2 parents 2e3276b + 4be739d g-akagi authored on 30 Jul 2021

Patch

Unified Split

Showing 9 changed files

Ignore Space Show notes View .idea/gradle.xml

Ignore Space Show notes View .idea/misc.xml

Show notes View .idea/runConfigurations.xml 100644 → 0

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/resources/gallery/LayersRest.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/create/CreateFragment.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintCanvas.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintViewModel.java

Ignore Space Show notes View app/src/main/java/org/ntlab/acanthus_client/views/paint/models/PaintConnectionModel.java

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

Show line notes below