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

3d6b6667

Commit 3d6b6667 authored 8 years ago by Pogman

Downloads
- Plain Diff

Merge remote-tracking branch 'remotes/origin/feature/PR104' into develop_invincible

# Conflicts:
#	app/src/main/java/info/nightscout/android/medtronic/MainActivity.java

parents 8f8ef8f9 1aeca0a4

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/AndroidManifest.xml 1 addition, 5 deletions

app/src/main/AndroidManifest.xml
app/src/main/java/info/nightscout/android/medtronic/MainActivity.java 37 additions, 11 deletions

.../java/info/nightscout/android/medtronic/MainActivity.java
app/src/main/java/info/nightscout/android/medtronic/service/MedtronicCnlIntentService.java 1 addition, 9 deletions

.../android/medtronic/service/MedtronicCnlIntentService.java

with 39 additions and 25 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