summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-01 17:30:06 +0200
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-01 17:30:06 +0200
commit6d077c90a01121e1d11c7a4c8e3867cebf937e0d (patch)
tree660b4107afc57b4885769c920d9697e72ff41931 /.gitignore
parentb42e01d7acf5d4c55612c3a7df0e1ff6ee5ed951 (diff)
parent701d1a33bb8227aa55a71f48caeb30a453e77ee0 (diff)
Merge branch 'main' into DRTVWR-588-maint-W
Diffstat (limited to '.gitignore')
-rwxr-xr-x.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 371b8383c0..3b3666af84 100755
--- a/.gitignore
+++ b/.gitignore
@@ -57,6 +57,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
@@ -68,6 +69,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