Merge branch 'master' into feature_print_monitoring

# Conflicts:
#	resources/qml/Cura.qml
This commit is contained in:
fieldOfView 2016-06-24 14:55:12 +02:00
commit 55af0af755
5 changed files with 17 additions and 6 deletions

View file

@ -813,3 +813,7 @@ class CuraApplication(QtApplication):
def _addProfileWriter(self, profile_writer):
pass
@pyqtSlot("QSize")
def setMinimumWindowSize(self, size):
self.getMainWindow().setMinimumSize(size)