chiark / gitweb /
Merge branch 'master' of github.com:daid/Cura
authorDaid <daid303@gmail.com>
Tue, 25 Sep 2012 10:09:09 +0000 (12:09 +0200)
committerDaid <daid303@gmail.com>
Tue, 25 Sep 2012 10:09:09 +0000 (12:09 +0200)
commit183304d975fc4b45cabbea373a7bcb7c878c6e15
tree5e899c8a2f2b39f3b81a595a7037d4d4820b8cb4
parent8732001ee475d58b9e40aa7763b251733de1a896
parentb785dccec199b2a4b686a76b3f75bed99795bd2a
Merge branch 'master' of github.com:daid/Cura

Conflicts:
Cura/util/machineCom.py