Merge branch 'Signup' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2020/org.ntlab.amaryllis.client

Fork: 0

nitta-lab-2020 / org.ntlab.amaryllis.client

Browse code Merge branch 'Signup' of http://nitta-lab-www.is.konan-u.ac.jp/gitbucket/git/nitta-lab-2020/org.ntlab.amaryllis.client # Conflicts: # app/src/main/AndroidManifest.xml 1001 1008 10261 10262 10263 1029 10291 10292 1110 11101 2020 CategoryRest Dialog(Category) PLM PLM2 PlayListManager Playbutton Shinji_1105 Signup VoiceEdit VoiceTest VoiceTest2 acfrag category crrentlocation fragment-maps main-screen master miyazaki1110 miyazaki1112 miyazaki1112_2 present-location set_category shinji10_26 shinji11_12 shinji_1013 shinji_1022_ test test11/12 voice_location voicememo_1112
commit 12dd08c5c3111454a22be3f79e0c7385353f1ee9 2 parents 03587a3 + e344b23 n-nittta authored on 12 Jun 2020

Browse code

# Conflicts:
#	app/src/main/AndroidManifest.xml

1001 1008 10261 10262 10263 1029 10291 10292 1110 11101 2020 CategoryRest Dialog(Category) PLM PLM2 PlayListManager Playbutton Shinji_1105 Signup VoiceEdit VoiceTest VoiceTest2 acfrag category crrentlocation fragment-maps main-screen master miyazaki1110 miyazaki1112 miyazaki1112_2 present-location set_category shinji10_26 shinji11_12 shinji_1013 shinji_1022_ test test11/12 voice_location voicememo_1112

commit 12dd08c5c3111454a22be3f79e0c7385353f1ee9

2 parents 03587a3 + e344b23

n-nittta authored on 12 Jun 2020

Patch

Unified Split

Showing 6 changed files

Ignore Space Show notes View .idea/gradle.xml

Ignore Space Show notes View .idea/misc.xml

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

Ignore Space Show notes View app/src/main/java/org/ntlab/amaryllis/client/SignupActivity.java

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

Ignore Space Show notes View build.gradle

Show line notes below