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

Conflicts:
	cura/MachineManagerModel.py
This commit is contained in:
Ghostkeeper 2016-06-06 16:41:34 +02:00
commit bcf7e0459b
3 changed files with 45 additions and 15 deletions

View file

@ -24,6 +24,7 @@ ScrollView
{
id: contents
spacing: UM.Theme.getSize("default_lining").height;
cacheBuffer: 1000000; // A huge to cache to effectively cache everything.
model: UM.SettingDefinitionsModel {
id: definitionsModel;