Johannes Mockenhaupt 0e61032dec Merge remote-tracking branch 'origin/dev' into combo-scripter-v2 ... * origin/dev: wear update RS create bond add scrollview QuickWizard detailed settings # Conflicts: # app/src/main/res/values/strings.xml		2017-12-27 18:19:51 +01:00
..
libs	wear add clockwise lib	2016-11-26 14:21:01 +01:00
src/main	make chart zoomable again	2017-12-04 20:08:57 +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	2017-12-27 18:19:51 +01:00
proguard-rules.pro	wear installing on watch	2016-11-24 16:23:31 +01:00