ForEasySignUp #59

Merged h-matsumoto merged 3 commits into nitta-lab-2018:master from nitta-lab-2018:ForEasySignUp on 16 Nov 2018

2018-11-15	b4b0319 Browse files » Merge branch 'master' into ForEasySignUp ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/BulletsManager.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/DummyBullet.java a-matsumoto committed on 15 Nov 2018
92bccda 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 15 Nov 2018
51cbaf8 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 15 Nov 2018

2018-11-15

b4b0319
Browse files »

Merge branch 'master' into ForEasySignUp ...

# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/BulletsManager.java
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/DummyBullet.java

a-matsumoto committed on 15 Nov 2018

92bccda
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 15 Nov 2018

51cbaf8
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 15 Nov 2018