ObjectsConnection #43

Closed t-hayashi wants to merge 2 commits into nitta-lab-2018:master from t-hayashi:ObjectsConnection

2018-10-16	d0e04a1 Browse files » Merge branch 'master' into Player ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/AndroidManifest.xml # app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java # build.gradle s-bekki committed on 16 Oct 2018
26e79b5 Browse files » Merge branch 'master' into Player ... # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/AndroidManifest.xml # app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java # build.gradle s-bekki committed on 16 Oct 2018

2018-10-16

d0e04a1
Browse files »

Merge branch 'master' into Player ...

# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java
#	build.gradle

s-bekki committed on 16 Oct 2018

26e79b5
Browse files »

Merge branch 'master' into Player ...

# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/org/ntlab/radishforandroidstudio/framework/RWT/RWTUIFragment.java
#	build.gradle

s-bekki committed on 16 Oct 2018