Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

S

SoniControl
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Incidents

Snippets Groups Projects

057f21a8

Commit 057f21a8 authored 7 years ago by aringot

Downloads
- Plain Diff

Merge branch 'develop' into feat-foregroundService

# Conflicts:
#	SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/MainActivity.java

parents a2b77993 e3817b03

Branches

Tags

Loading

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

SoniControl/app/src/main/java/at/ac/fhstp/sonicontrol/MainActivity.java 60 additions, 0 deletions

...p/src/main/java/at/ac/fhstp/sonicontrol/MainActivity.java
SoniControl/app/src/main/res/values/strings.xml 6 additions, 0 deletions

SoniControl/app/src/main/res/values/strings.xml
SoniControl/app/src/main/res/xml/settings_release.xml 1 addition, 0 deletions

SoniControl/app/src/main/res/xml/settings_release.xml

with 67 additions and 0 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment