diff options
| author | Anton Yabchinskiy | 2014-12-23 23:44:07 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy | 2014-12-23 23:44:07 +0300 |
| commit | 4ab1bcde35a02cfe7b25d630720de1cc81ef5a1a (patch) | |
| tree | b476b0f4aa8df1801361a04390c98cf0e2e3d98b /modules/gdscript/gd_tokenizer.h | |
| parent | ff755f93eb86e3f7f6801918457ca77a3001671b (diff) | |
| parent | 530d717a67cc3acab10270dca700db328aa12891 (diff) | |
| download | godot-4ab1bcde35a02cfe7b25d630720de1cc81ef5a1a.tar.gz godot-4ab1bcde35a02cfe7b25d630720de1cc81ef5a1a.tar.zst godot-4ab1bcde35a02cfe7b25d630720de1cc81ef5a1a.zip | |
Merge branch 'master' of github.com:okamstudio/godot
Conflicts:
drivers/SCsub
platform/x11/detect.py
platform/x11/os_x11.h
Diffstat (limited to 'modules/gdscript/gd_tokenizer.h')
| -rw-r--r-- | modules/gdscript/gd_tokenizer.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/gdscript/gd_tokenizer.h b/modules/gdscript/gd_tokenizer.h index fe7bfa73c..ff59c249a 100644 --- a/modules/gdscript/gd_tokenizer.h +++ b/modules/gdscript/gd_tokenizer.h @@ -118,6 +118,7 @@ public: TK_NEWLINE, TK_ERROR, TK_EOF, + TK_CURSOR, //used for code completion TK_MAX }; |