1
0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-07-03 11:33:19 +02:00
Gadgetbridge/app/src/main
Daniele Gobbetti bb962001a5 Merge branch 'master' into background-javascript
# Conflicts:
#	app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
2017-09-03 16:49:27 +02:00
..
.settings #15 Initial support for MI Band 2015-04-19 02:37:29 +02:00
aidl/com/android/internal/telephony Support for rejecting/ending calls via Pebble buttons 2015-03-07 17:44:39 +01:00
assets Merge branch 'master' into background-javascript 2017-08-18 12:15:01 +02:00
java Merge branch 'master' into background-javascript 2017-09-03 16:49:27 +02:00
res Merge branch 'master' into background-javascript 2017-09-03 16:49:27 +02:00
.classpath #15 Initial support for MI Band 2015-04-19 02:37:29 +02:00
.project #15 Initial support for MI Band 2015-04-19 02:37:29 +02:00
AndroidManifest.xml Merge branch 'master' into background-javascript 2017-08-28 00:35:28 +02: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