diff options
| author | Carl Olsson | 2015-02-11 21:15:49 +1000 |
|---|---|---|
| committer | Carl Olsson | 2015-02-11 21:15:49 +1000 |
| commit | 573ae5dd926df0dbd63b787945ace0fa76f08976 (patch) | |
| tree | ca21f025cab021fdb43d6a7b77222c4bcf62f63a /modules/gdscript | |
| parent | 9171f71ff55def0f661a3d76e4ebcfc945092ad3 (diff) | |
| parent | 78a268c2eb3099103164407761e06afa0c6339d4 (diff) | |
| download | godot-573ae5dd926df0dbd63b787945ace0fa76f08976.tar.gz godot-573ae5dd926df0dbd63b787945ace0fa76f08976.tar.zst godot-573ae5dd926df0dbd63b787945ace0fa76f08976.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
demos/2d/polygon_path_finder_demo/.fscache
Diffstat (limited to 'modules/gdscript')
| -rw-r--r-- | modules/gdscript/gd_editor.cpp | 2 |
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"; |