Milos Kozak 6a6a02f212 Merge branch 'dev' into history		2017-05-12 23:04:39 +02:00
..
comm	consolidate DanaR code	2017-05-12 22:40:22 +02:00
Dialogs	upgrade travis & plugin packages	2017-04-21 12:15:08 +02:00
events	upgrade travis & plugin packages	2017-04-21 12:15:08 +02:00
History	Merge branch 'dev' into history	2017-05-12 23:04:39 +02:00
services	fix conflict	2017-05-09 10:14:21 +02:00
BluetoothDevicePreference.java	upgrade travis & plugin packages	2017-04-21 12:15:08 +02:00
DanaRFragment.java	move part of PumpInterface to TreatmentInterface	2017-05-12 21:07:29 +02:00
DanaRPlugin.java	move rest of PumpInterface to TreatmentInterface	2017-05-12 21:21:31 +02:00
DanaRPump.java	consolidate DanaR code	2017-05-12 22:40:22 +02:00
SerialIOThread.java	upgrade travis & plugin packages	2017-04-21 12:15:08 +02:00