Johannes Mockenhaupt 612fc09e52 Merge remote-tracking branch 'origin/dev' into combo-dev-merge ... * origin/dev: Don't overlap time ticks with current time history browser chart selection Insulin button: allow negative presets, fix adding TT insulin. Overview: symetric spacing. Carbs button: send carbs to pump if pump supports carbs. Carbs button: fix visibility pref, input type, allow negative increments. Smallscreen fix chart menu 4 chart menu 3 chart menu 2 chart menu 1 # Conflicts: # app/src/main/res/values/strings.xml		2018-03-17 16:45:08 +01:00
..
libs	wear add clockwise lib	2016-11-26 14:21:01 +01:00
src/main	Don't overlap time ticks with current time	2018-03-16 23:57:58 +01:00
.gitignore	fix gitignore	2017-02-11 01:50:25 +01:00
build.gradle	Merge remote-tracking branch 'origin/dev' into combo-scripter-v2	2018-01-13 23:18:44 +01:00
proguard-rules.pro	wear installing on watch	2016-11-24 16:23:31 +01:00