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

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 Shimokawa_DrawingRest Conflicts: .idea/deploymentTargetDropDown.xml DrawingActivity GameActivity_Shimokawa GameView1110 GameViewActivity1108 GameViewActivity1115 GameViewModel1020 GameViewModel1117 List1025 Okazaki0927 Owner10/27 Owner1101 OwnerRoomActivity cardfragment_bug1105 cardfragment_bug1108 drawingCardFragment_ConnectViewModel drawingCard_endlogic drawingFragment_outputDrawImage drawingcardbug_1110 drawingcardfragment-1101error drawingcardfragment-connectVM2 fragment-urlToImage master o_game ok_home output_log test01
commit ec1e271751246b3992c07a02c7343dff9192b7bd 2 parents 590d637 + d4cf4c7 g-akagi authored on 20 Sep 2022

Browse code

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

Conflicts:
	.idea/deploymentTargetDropDown.xml

DrawingActivity GameActivity_Shimokawa GameView1110 GameViewActivity1108 GameViewActivity1115 GameViewModel1020 GameViewModel1117 List1025 Okazaki0927 Owner10/27 Owner1101 OwnerRoomActivity cardfragment_bug1105 cardfragment_bug1108 drawingCardFragment_ConnectViewModel drawingCard_endlogic drawingFragment_outputDrawImage drawingcardbug_1110 drawingcardfragment-1101error drawingcardfragment-connectVM2 fragment-urlToImage master o_game ok_home output_log test01

commit ec1e271751246b3992c07a02c7343dff9192b7bd

2 parents 590d637 + d4cf4c7

g-akagi authored on 20 Sep 2022

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View .idea/deploymentTargetDropDown.xml

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/irisclient/DrawingActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/GameActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/activity_game.xml 0 → 100644

Show line notes below