summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorEuclid Linden <euclid@lindenlab.com>2021-12-15 22:12:26 +0000
committerEuclid Linden <euclid@lindenlab.com>2021-12-15 22:12:26 +0000
commit23fc6ac098707830c219dd2d981af83f96c9714b (patch)
tree014c480a7dc85ea6365a486984aa9667fb7a4dce /.gitignore
parent828e58432981e7c256618bd293f77906abaae699 (diff)
parent0952086eeb937707d1470989579611a1966cafbe (diff)
Merged in DV546-merge-6.5.2 (pull request #814)
DRTVWR-546 merge up to 6.5.2
Diffstat (limited to '.gitignore')
-rwxr-xr-x.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 3619681d82..839d14bc0d 100755
--- a/.gitignore
+++ b/.gitignore
@@ -57,6 +57,7 @@ indra/newview/search_history.txt
indra/newview/teleport_history.txt
indra/newview/typed_locations.txt
indra/newview/vivox-runtime
+indra/newview/skins/default/html/common/equirectangular/js
indra/server-linux-*
indra/temp
indra/test/linden_file.dat