Merge remote-tracking branch 'origin/master' into OwnerRoomActivity

Fork: 0

nitta-lab-2022 / IrisClient

Browse code Merge remote-tracking branch 'origin/master' into OwnerRoomActivity # Conflicts: # .idea/gradle.xml # .idea/misc.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 322a72883870e2276980e0aa893d0aca3edc4a0b 2 parents 42e6068 + 6a5a879 r-nishimura authored on 24 Jun 2022

Browse code

# Conflicts:
#	.idea/gradle.xml
#	.idea/misc.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 322a72883870e2276980e0aa893d0aca3edc4a0b

2 parents 42e6068 + 6a5a879

r-nishimura authored on 24 Jun 2022

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View .idea/gradle.xml

Ignore Space Show notes View .idea/inspectionProfiles/Project_Default.xml 0 → 100644

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/MainActivity.java

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

Show line notes below