Merge branch 'master' into ログインの通信

Fork: 0

nitta-lab-2018 / Cactus

Browse code Merge branch 'master' into ログインの通信 # Conflicts: # app/build.gradle まーじしました CleanArchitecture ForEasySignUp PlayerFragment RemakeLoginFragment all-layout bullet correct_design logout_player master object_move test ui
commit 740caf7c1135da95a41bca267e2390cd21f902f4 2 parents f43355b + 8b88ddb a-matsumoto authored on 12 Jun 2018

Patch

Unified Split

Showing 6 changed files

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

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/framework/gameMain/RealTime3DActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/sample/SampleActivity.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/activity_sample.xml 0 → 100644

Ignore Space Show notes View app/src/main/res/layout/button_layout.xml 0 → 100644

Show line notes below