Merge remote-tracking branch 'origin/master'

This commit is contained in:
Gina Häußge 2014-08-30 10:08:52 +02:00
commit 9f463707ee

View file

@ -45,6 +45,7 @@ def serialList():
+ glob.glob("/dev/ttyAMA*") \
+ glob.glob("/dev/tty.usb*") \
+ glob.glob("/dev/cu.*") \
+ glob.glob("/dev/cuaU*") \
+ glob.glob("/dev/rfcomm*")
additionalPorts = settings().get(["serial", "additionalPorts"])