Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite

This commit is contained in:
Jaime van Kessel 2017-12-06 13:33:20 +01:00
commit aba8bd89c3
129 changed files with 15629 additions and 3612 deletions

View file

@ -152,4 +152,4 @@ class ConnectionState(IntEnum):
connecting = 1
connected = 2
busy = 3
error = 4
error = 4