Merge branch 'master' into PlplupLearnedBulletSeed #54

Merged h-matsumoto merged 1 commit into nitta-lab-2018:master from nitta-lab-2018:ChangeViewpoint on 9 Nov 2018

2018-11-08	c3c1e1e Browse files » 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 微修正 a-matsumoto committed on 8 Nov 2018

2018-11-08

c3c1e1e
Browse files »

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

微修正

a-matsumoto committed on 8 Nov 2018