Merge branch 'master' into 'develop-alex'
# Conflicts: # app/build.gradle # app/src/main/java/com/virjar/majora/adr/KeepAliveService.java # app/src/main/java/com/virjar/majora/adr/MainActivity.java # app/src/main/java/com/virjar/majora/adr/Shell.java # app/src/main/java/com/virjar/majora/adr/TheApp.java # app/src/main/res/layout/activity_main.xml
Showing
File mode changed from 100644 to 100755
app/src/main/res/layout/activity_settings.xml
100644 → 100755
File mode changed from 100644 to 100755
app/src/main/res/xml/pref_setting.xml
100644 → 100755
File mode changed from 100644 to 100755
gradlew
100644 → 100755
File mode changed from 100644 to 100755
Please
register
or
sign in
to comment