Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1

This commit is contained in:
Ghostkeeper 2016-01-21 10:25:14 +01:00
commit 89a4ab0fe2
2 changed files with 2 additions and 2 deletions

View file

@ -8,6 +8,6 @@ TryExec=/usr/bin/cura_app.py
Icon=/usr/share/cura/resources/images/cura-icon.png
Terminal=false
Type=Application
MimeType=application/sla
MimeType=application/sla;image/bmp;image/gif;image/jpeg;image/png
Categories=Graphics;
Keywords=3D;Printing;

View file

@ -237,7 +237,7 @@
"save_button_save_to_button": [0.3, 2.7],
"save_button_specs_icons": [1.4, 1.4],
"modal_window_minimum": [40.0, 30.0],
"modal_window_minimum": [60.0, 45],
"wizard_progress": [10.0, 0.0],
"message": [30.0, 5.0],