aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2020-04-26 08:34:14 +0200
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2020-04-26 08:34:14 +0200
commit9038c50a3a350312c9895240be28b4fb90fbe3b1 (patch)
treecbc8824844340d8eff76f57455fcea8e7a9d6cd6 /Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting
parentccaf9afcde7a630a7d765fa9874322b5f44e2df7 (diff)
parent8438e5447b6bed6ed97f2e3fda6977ce4bf74d0c (diff)
downloadTango-9038c50a3a350312c9895240be28b4fb90fbe3b1.tar.gz
Tango-9038c50a3a350312c9895240be28b4fb90fbe3b1.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting')
-rw-r--r--Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/CSharp-Mode.xshd1
1 files changed, 1 insertions, 0 deletions
diff --git a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/CSharp-Mode.xshd b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/CSharp-Mode.xshd
index 409825b42..6f400c4f5 100644
--- a/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/CSharp-Mode.xshd
+++ b/Software/Visual_Studio/Scripting/Tango.Scripting.Editors/Highlighting/Resources/CSharp-Mode.xshd
@@ -194,6 +194,7 @@
<Word>enum</Word>
<Word>float</Word>
<Word>int</Word>
+ <Word>object</Word>
<Word>string</Word>
<Word>long</Word>
<Word>sbyte</Word>