diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-10-28 16:47:24 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-10-28 16:47:24 -0400 |
| commit | f49f6c8ef27bb73179f12d82401026ec2bb49155 (patch) | |
| tree | 665a08d88dd7796aaf7b0d5a25847c8c257a1e5d /indra/newview/app_settings | |
| parent | 749fbe7d514fcab82a8bb3f16ce793dccedbd542 (diff) | |
| parent | 4fd9a53115bf85ffe17974323d5fa609e0df960c (diff) | |
merge changes for storm-959
Diffstat (limited to 'indra/newview/app_settings')
| -rw-r--r-- | indra/newview/app_settings/keywords.ini | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/app_settings/keywords.ini b/indra/newview/app_settings/keywords.ini index b5f105439c..82b43432eb 100644 --- a/indra/newview/app_settings/keywords.ini +++ b/indra/newview/app_settings/keywords.ini @@ -603,9 +603,11 @@ return Leave current function or event handler # Comment [one_sided_delimiter .8, .3, .15] // Comment:Non-functional commentary or disabled code +[two_sided_delimiter .8, .3, .15] +/* */ Comment:Non-functional commentary or disabled code # String literals -[two_sided_delimiter 0, .2, 0] +[double_quotation_marks 0, .2, 0] " String literal #functions are supplied by the program now |