Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

6

600SeriesAndroidUploader
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Incidents

Snippets Groups Projects

3aa04520

Commit 3aa04520 authored 8 years ago by Volker Richert

Downloads
- Plain Diff

Merge branch 'upstream/master'

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

parents 27a2096c da3d92d8

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/AndroidManifest.xml 5 additions, 0 deletions

app/src/main/AndroidManifest.xml
app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java 28 additions, 0 deletions

.../android/medtronic/service/MedtronicCnlIntentService.java
app/src/main/java/info/nightscout/android/xdrip_plus/XDripPlusUploadIntentService.java 171 additions, 0 deletions

...cout/android/xdrip_plus/XDripPlusUploadIntentService.java
app/src/main/java/info/nightscout/android/xdrip_plus/XDripPlusUploadReceiver.java 22 additions, 0 deletions

...ightscout/android/xdrip_plus/XDripPlusUploadReceiver.java
app/src/main/res/values/strings.xml 1 addition, 0 deletions

app/src/main/res/values/strings.xml
app/src/main/res/xml/preferences.xml 4 additions, 0 deletions

app/src/main/res/xml/preferences.xml

with 231 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