summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-12 21:14:45 +0200
committerGitHub <noreply@github.com>2024-03-12 21:14:45 +0200
commit6b285674bba145dd70b90a06248ba8dd7fdc474a (patch)
tree110015e1703b331715fbf7fb1a01639c74c47e62 /.gitignore
parent748c0eb50d87a3f8895b25791409ce5e2e4926c4 (diff)
parenteb1ed3896fd82d4f115b2ef6ba742315ad32cc27 (diff)
Merge main into DRTVWR-600-maint-A
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