Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2022/IrisClient into o

Fork: 0

nitta-lab-2022 / IrisClient

Browse code Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2022/IrisClient into o_game DrawingActivity GameActivity_Shimokawa GameView1110 GameViewActivity1108 GameViewActivity1115 GameViewModel1117 Owner10/27 Owner1101 cardfragment_bug1105 cardfragment_bug1108 drawingCard_endlogic drawingcardbug_1110 drawingcardfragment-1101error drawingcardfragment-connectVM2 master o_game ok_home output_log
commit f01b82a8ead9758670b5160a7d6a59970b40be4b 2 parents 888002a + 44d10df d-matsuura authored on 27 Oct 2022

Browse code

Merge branch 'master' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2022/IrisClient into o_game

DrawingActivity GameActivity_Shimokawa GameView1110 GameViewActivity1108 GameViewActivity1115 GameViewModel1117 Owner10/27 Owner1101 cardfragment_bug1105 cardfragment_bug1108 drawingCard_endlogic drawingcardbug_1110 drawingcardfragment-1101error drawingcardfragment-connectVM2 master o_game ok_home output_log

commit f01b82a8ead9758670b5160a7d6a59970b40be4b

2 parents 888002a + 44d10df

d-matsuura authored on 27 Oct 2022

Patch

Unified Split

Showing 2 changed files

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/DrawingActivity.java

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

Show line notes below