Merge branch 'master' into PlplupLearnedBulletSeed

Fork: 0

n-konishi / Cactus-CleanArchitecture

Browse code Merge branch 'master' into PlplupLearnedBulletSeed # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java # app/src/main/res/layout/ui_fragment.xml 何もしてない CleanArchitecture chenge_design correct_design master onResponse update update2
1 parent 51cbaf8 commit 92bccda91c91e3c2c74cbe20f05e2ea005b3bdd3 a-matsumoto authored on 15 Nov 2018

Browse code

# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java
#	app/src/main/res/layout/ui_fragment.xml

何もしてない

CleanArchitecture chenge_design correct_design master onResponse update update2

1 parent 51cbaf8 commit 92bccda91c91e3c2c74cbe20f05e2ea005b3bdd3

a-matsumoto authored on 15 Nov 2018

Patch

Unified Split

Showing 3 changed files

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/BulletCreateConnection.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/OwnPlayer.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/PlayerFragment.java

Show line notes below