3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-10 07:15:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' into feature_print_monitoring

Browse source 
# 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
Download patch file Download diff file Expand all files Collapse all files

1
resources/themes/cura/theme.json
View file

@ -168,6 +168,7 @@
},
"sizes": {
"window_minimum_size": [70, 54],
"window_margin": [1.0, 1.0],
"default_margin": [1.0, 1.0],
"default_lining": [0.08, 0.08],