diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-03-01 10:17:37 -0800 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-03-01 10:17:37 -0800 |
| commit | 8164dce567d1bd59a1de3f488b01783a5ab69ed4 (patch) | |
| tree | 5e509afd404c086e32ee4ba91b48118c0e3068f5 /.gitignore | |
| parent | 7d1e3e08fcfbb3801edde3b6d248080055cd0a75 (diff) | |
| parent | 258c039584dd293ba7218dc522882bc0bac25e63 (diff) | |
Merge remote-tracking branch 'origin/release/gltf-maint2' into release/materials_featurette
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 2 |
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 |