Merge branch '2.1'

This commit is contained in:
Tim Kuipers 2016-01-28 15:25:18 +01:00
commit 8a48791a0b
83 changed files with 14784 additions and 9510 deletions

View file

@ -39,7 +39,7 @@ UM.PreferencesPage
checked: boolCheck(UM.Preferences.getValue("view/show_overhang"))
onClicked: UM.Preferences.setValue("view/show_overhang", checked)
text: catalog.i18nc("@option:check","Display Overhang");
text: catalog.i18nc("@option:check","Display overhang");
}
}