diff options
author | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2023-10-07 15:16:07 +0200 |
---|---|---|
committer | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2023-10-08 14:01:05 +0200 |
commit | e7f1466a7b7a26ab7e3ff113a85e2b533f6ee941 (patch) | |
tree | ed709498a0fba4d9c04dbd61fc73466b5a535bf0 /.gitignore | |
parent | 2465470817957c8378e81ec1a7e32551fbac7b26 (diff) | |
parent | 13fe9744d7fb005ec37c05eae70e9bb2c518cb88 (diff) |
Merge branch main into DRTVWR-489
Diffstat (limited to '.gitignore')
-rwxr-xr-x | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 80eca667df..23a7f0cb4b 100755 --- a/.gitignore +++ b/.gitignore @@ -44,6 +44,7 @@ indra/newview/dbghelp.dll indra/newview/filters.xml indra/newview/fmod.dll indra/newview/fmod.log +indra/newview/fonts indra/newview/mozilla-theme indra/newview/mozilla-universal-darwin.tgz indra/newview/pilot.txt @@ -55,6 +56,7 @@ indra/newview/teleport_history.txt indra/newview/typed_locations.txt indra/newview/vivox-runtime indra/newview/skins/default/html/common/equirectangular/js +emoji_characters.xml indra/server-linux-* indra/temp indra/test/linden_file.dat |