diff options
| author | Youness Alaoui <kakaroto@kakaroto.homelinux.net> | 2015-01-15 22:19:24 +0300 |
|---|---|---|
| committer | Youness Alaoui <kakaroto@kakaroto.homelinux.net> | 2015-01-15 22:19:24 +0300 |
| commit | 712fe87b4a0e0fe4242aa620cc36ff0efb039f03 (patch) | |
| tree | 31b69b723336d004addc79654b7c02fb33616612 | |
| parent | 2fbb3b352e0077948073a1204daddb65c5a3e75c (diff) | |
| parent | af833610f878f71c7b0a36b34febfc70ae82ed46 (diff) | |
Merge tag '14.12' into upstreamlulzbot-14.12-rc1
Conflicts:
Cura/gui/app.py
Cura/gui/configWizard.py
Cura/gui/firmwareInstall.py
Cura/util/bigDataStorage.py
Cura/util/profile.py
package.sh
| -rw-r--r-- | Cura/gui/printWindow.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Cura/gui/printWindow.py b/Cura/gui/printWindow.py index eb2eb250b0..6356df6491 100644 --- a/Cura/gui/printWindow.py +++ b/Cura/gui/printWindow.py @@ -505,6 +505,9 @@ class printWindowBasic(wx.Frame): def _addTermLog(self, msg): pass + def _addTermLog(self, msg): + pass + def _updateButtonStates(self): self.connectButton.Show(self._printerConnection.hasActiveConnection()) self.connectButton.Enable(not self._printerConnection.isActiveConnectionOpen() and not self._printerConnection.isActiveConnectionOpening()) |