diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-15 02:29:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-15 02:29:52 +0200 |
| commit | 82ff99c18005f67c6d7692abf7594e31fc067f3c (patch) | |
| tree | 756ee21e5f458643392dc175bde7b74bcb6c5c90 /modules/gdscript/gdscript_tokenizer.h | |
| parent | d423906c03e02d5682ca018c387c148437278902 (diff) | |
| parent | c0e4d7efca7eb24e91783a0ee15ac0ef0248833c (diff) | |
Merge pull request #22087 from Faless/master_of_puppets
Deprecate slave keyword in favor of puppet.
Diffstat (limited to 'modules/gdscript/gdscript_tokenizer.h')
| -rw-r--r-- | modules/gdscript/gdscript_tokenizer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/gdscript/gdscript_tokenizer.h b/modules/gdscript/gdscript_tokenizer.h index 01b1ac5bf2..cc894fb101 100644 --- a/modules/gdscript/gdscript_tokenizer.h +++ b/modules/gdscript/gdscript_tokenizer.h @@ -119,9 +119,10 @@ public: TK_PR_SYNC, TK_PR_MASTER, TK_PR_SLAVE, + TK_PR_PUPPET, TK_PR_REMOTESYNC, TK_PR_MASTERSYNC, - TK_PR_SLAVESYNC, + TK_PR_PUPPETSYNC, TK_BRACKET_OPEN, TK_BRACKET_CLOSE, TK_CURLY_BRACKET_OPEN, |