Merge branch 'Player' into restore

Fork: 0

n-konishi / Cactus-CleanArchitecture

Browse code Merge branch 'Player' into restore # 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 CleanArchitecture chenge_design correct_design master onResponse update update2
commit 6e731658a1444b3f56f6618479e204573e993fb2 2 parents 518d384 + 99912cb n-konishi authored on 26 Jun 2018

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View app/src/main/AndroidManifest.xml

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/PlayerActivity.java 0 → 100644

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/sample/SampleGameActivity.java

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

Show line notes below