Johannes Mockenhaupt d54b99c559 Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: Cleanup gradle build files Add null check in ConfigBuildPlugin.getTempBasalFromHistory. Avoid race condition checking for an active TBR. Steampunk watch face: Chart readability improvement; point size increases when chert is highly zoomed in (less than 3 hours shown). # Conflicts: # app/build.gradle		2018-01-13 23:18:44 +01:00
..
libs	wear add clockwise lib	2016-11-26 14:21:01 +01:00
src/main	Steampunk watch face: Chart readability improvement; point size increases when chert is highly zoomed in (less than 3 hours shown).	2018-01-06 14:21:31 +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