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

This commit is contained in:
Jaime van Kessel 2015-09-17 11:08:39 +02:00
commit e7a4f76c62
24 changed files with 10 additions and 10 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -3,48 +3,48 @@
"large": {
"size": 1.5,
"bold": true,
"family": "ProximaNova"
"family": "Roboto"
},
"default": {
"size": 1,
"family": "ProximaNova"
"family": "Roboto"
},
"default_allcaps": {
"size": 1,
"capitalize": true,
"family": "ProximaNova"
"family": "Roboto"
},
"small": {
"size": 0.75,
"family": "ProximaNova"
"family": "Roboto"
},
"tiny": {
"size": 0.5,
"family": "ProximaNova"
"family": "Roboto"
},
"caption": {
"size": 0.75,
"italic": true,
"family": "ProximaNova"
"family": "Roboto"
},
"sidebar_header": {
"size": 0.75,
"capitalize": true,
"family": "ProximaNova"
"family": "Roboto"
},
"timeslider_time": {
"size": 1.0,
"bold": true,
"family": "ProximaNova"
"family": "Roboto"
},
"button_tooltip": {
"size": 0.75,
"capitalize": true,
"family": "ProximaNova"
"family": "Roboto"
},
"setting_category": {
"size": 1.0,
"family": "ProximaNova"
"family": "Roboto"
}
},