aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorhurikhan2015-02-12 15:58:29 +0100
committerhurikhan2015-02-12 15:58:29 +0100
commita13e180052d2e17275498a2fa78185cc299ace11 (patch)
tree6f9051d0b3d2444ac09c1bbf78f9e395af1782e9 /modules
parentdf7d26ff5b89ce9852813abd370d1357aab1501b (diff)
parentb3a6cc097d5bc60ee6e7ba30b177bed3a8aadc71 (diff)
downloadgodot-a13e180052d2e17275498a2fa78185cc299ace11.tar.gz
godot-a13e180052d2e17275498a2fa78185cc299ace11.tar.zst
godot-a13e180052d2e17275498a2fa78185cc299ace11.zip
Merge remote-tracking branch 'upstream/master' into x11-window-management
Diffstat (limited to 'modules')
-rw-r--r--modules/gdscript/gd_editor.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp
index 20cd09efd..df091fbcc 100644
--- a/modules/gdscript/gd_editor.cpp
+++ b/modules/gdscript/gd_editor.cpp
@@ -51,7 +51,7 @@ String GDScriptLanguage::get_template(const String& p_class_name, const String&
"# var a=2\n"+
"# var b=\"textvar\"\n\n"+
"func _ready():\n"+
- "\t# Initalization here\n"+
+ "\t# Initialization here\n"+
"\tpass\n"+
"\n"+
"\n";