mamutcho 61da55e0de Merge branch 'master' of https://codeberg.org/Freeyourgadget/Gadgetbridge ... Conflicts: GBDaoGenerator/src/nodomain/freeyourgadget/gadgetbridge/daogen/GBDaoGenerator.java		2020-04-20 14:42:20 +03:00
..
aidl	add stripped down version of weather part of lineage sdk	2019-08-22 21:19:03 +02:00
assets	Revert "declare geposition variable"	2018-11-02 11:24:59 +01:00
java	Merge branch 'master' of https://codeberg.org/Freeyourgadget/Gadgetbridge	2020-04-20 14:42:20 +03:00
res	Merge branch 'master' of https://codeberg.org/Freeyourgadget/Gadgetbridge	2020-04-20 14:42:20 +03:00
AndroidManifest.xml	Merge branch 'master' of https://codeberg.org/Freeyourgadget/Gadgetbridge	2020-04-20 14:42:20 +03:00
lint.xml	#15 Initial support for MI Band	2015-04-19 02:37:29 +02:00
project.properties	#15 Initial support for MI Band	2015-04-19 02:37:29 +02:00