Merge branch 'master' into 2018年7月24日AkiMatsumoto

Fork: 0

nitta-lab-2018 / Cactus

Browse code Merge branch 'master' into 2018年7月24日AkiMatsumoto # Conflicts: # .idea/caches/build_file_checksums.ser # app/src/main/AndroidManifest.xml # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java # app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java CleanArchitecture ForEasySignUp RemakeLoginFragment all-layout bullet correct_design logout_player master object_move test ui
commit decee15d6c7b3d24ae8c950b7f0e315d3fcf1efa 2 parents f693c4d + d635f32 n-konishi authored on 31 Jul 2018

Browse code

# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java
#	app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java

CleanArchitecture ForEasySignUp RemakeLoginFragment all-layout bullet correct_design logout_player master object_move test ui

commit decee15d6c7b3d24ae8c950b7f0e315d3fcf1efa

2 parents f693c4d + d635f32

n-konishi authored on 31 Jul 2018

Patch

Unified Split

Showing 13 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/Cactus.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/MainActivity.java

Ignore Space Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/SampleActivity.java

Show notes View app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/tests/StartFragment.java 100644 → 0

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

Ignore Space Show notes View app/src/main/res/drawable/nittalab.png 0 → 100644

Ignore Space Show notes View app/src/main/res/drawable/splash.xml 0 → 100644

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

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

Ignore Space Show notes View app/src/main/res/values/colors.xml

Ignore Space Show notes View app/src/main/res/values/strings.xml

Ignore Space Show notes View app/src/main/res/values/styles.xml

Show line notes below