Daniele Gobbetti 5c0c5581bb Merge branch 'master' into background-javascript ... # Conflicts: # app/src/main/assets/app_config/js/gadgetbridge_boilerplate.js # app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractDeviceCoordinator.java # app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/DeviceCoordinator.java		2017-04-08 21:16:01 +02:00
..
PBWInstallHandler.java	Add license header to all java files.	2017-03-10 14:53:19 +01:00
PBWReader.java	Fix firmware installation on Pebble Time Round	2017-03-17 22:34:50 +01:00
PebbleColor.java	Add license header to all java files.	2017-03-10 14:53:19 +01:00
PebbleCoordinator.java	Merge branch 'master' into background-javascript	2017-03-10 23:14:40 +01:00
PebbleHealthSampleProvider.java	Remove obsolte and unused code related to old and unsupported activity database	2017-03-20 22:27:17 +01:00
PebbleIconID.java	Add license header to all java files.	2017-03-10 14:53:19 +01:00
PebbleInstallable.java	Add license header to all java files.	2017-03-10 14:53:19 +01:00
PebbleMisfitSampleProvider.java	Remove obsolte and unused code related to old and unsupported activity database	2017-03-20 22:27:17 +01:00
PebbleMorpheuzSampleProvider.java	Remove obsolte and unused code related to old and unsupported activity database	2017-03-20 22:27:17 +01:00
PebblePairingActivity.java	Update license header in all java files.	2017-03-16 17:36:15 +01:00
STM32CRC.java	Add license header to all java files.	2017-03-10 14:53:19 +01:00