summaryrefslogtreecommitdiffstats
path: root/tools/editor/plugins/script_editor_plugin.cpp
diff options
context:
space:
mode:
authorAnton Yabchinskiy <arn@bestmx.ru>2015-01-21 12:03:29 +0300
committerAnton Yabchinskiy <arn@bestmx.ru>2015-01-21 12:03:29 +0300
commit6f93e6812edaf6c8c79c28dadbe5f1c4a8ced93e (patch)
tree70e49e718d13300738c45b0de1aee5afab9ddf31 /tools/editor/plugins/script_editor_plugin.cpp
parentfa38e9b838f32baedfca7a9250a76418b1872f5d (diff)
parentc6eabbbec5a9fec7a0d473fe67a544af3454c3d2 (diff)
downloadredot-engine-6f93e6812edaf6c8c79c28dadbe5f1c4a8ced93e.tar.gz
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'tools/editor/plugins/script_editor_plugin.cpp')
-rw-r--r--tools/editor/plugins/script_editor_plugin.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp
index d90597ddfb..4b7d1cf0e0 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/tools/editor/plugins/script_editor_plugin.cpp
@@ -1607,7 +1607,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
edit_menu->get_popup()->add_item("Clone Down",EDIT_CLONE_DOWN,KEY_MASK_CMD|KEY_B);
edit_menu->get_popup()->add_separator();
#ifdef OSX_ENABLED
- edit_menu->get_popup()->add_item("Complete Symbol",EDIT_COMPLETE,KEY_MASK_META|KEY_SPACE);
+ edit_menu->get_popup()->add_item("Complete Symbol",EDIT_COMPLETE,KEY_MASK_CTRL|KEY_SPACE);
#else
edit_menu->get_popup()->add_item("Complete Symbol",EDIT_COMPLETE,KEY_MASK_CMD|KEY_SPACE);
#endif