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

47c63b27

Commit 47c63b27 authored 8 years ago by Volker Richert

Downloads
- Patches
- Plain Diff

Merge branch 'develop' into feature/history

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

parent 228bcef2

Branches

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/src/main/java/info/nightscout/android/medtronic/MainActivity.java 0 additions, 2 deletions

.../java/info/nightscout/android/medtronic/MainActivity.java
app/src/main/java/info/nightscout/android/medtronic/message/AbstractBinaryRequestMessage.java 1 addition, 1 deletion

...droid/medtronic/message/AbstractBinaryRequestMessage.java
app/src/main/java/info/nightscout/android/medtronic/message/AbstractRequestMessage.java 1 addition, 1 deletion

...out/android/medtronic/message/AbstractRequestMessage.java
app/src/main/java/info/nightscout/android/medtronic/message/MedtronicRequestMessage.java 1 addition, 1 deletion

...ut/android/medtronic/message/MedtronicRequestMessage.java
app/src/main/java/info/nightscout/android/medtronic/message/pump/MedtronicSendMessageRequestMessage.java 1 addition, 1 deletion

...onic/message/pump/MedtronicSendMessageRequestMessage.java
app/src/main/java/info/nightscout/android/medtronic/message/pump/ReadHistoryBaseRequestMessage.java 12 additions, 0 deletions

...medtronic/message/pump/ReadHistoryBaseRequestMessage.java

with 16 additions and 6 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