Solve conflict

This commit is contained in:
kalbl
2016-11-23 13:34:38 +01:00
130 changed files with 2737 additions and 4309 deletions

View File

@@ -14,7 +14,7 @@ helper.scheduledScript.reversible = {}
helper.setCommonKeys = function()
openspace.bindKeyLocal(
"F1",
"openspace.gui.toggle()",
helper.property.invert('Global Properties.OnScreenGUI.Main.enabled'),
"Toggles the visibility of the on-screen GUI."
)
openspace.bindKeyLocal(