summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPtolemy <ptolemy@lindenlab.com>2020-06-29 18:21:11 -0700
committerPtolemy <ptolemy@lindenlab.com>2020-06-29 18:21:11 -0700
commit97de9cd465bae1412e38df34a4ab014439948acc (patch)
tree09ba540ef9a767c3c9f40e0e289adbed310c2ba1 /.gitignore
parent82882d77c41edc3fc3a962ab95ad19fc99604228 (diff)
parenta9471433eb7d0aa28c3a5b248ad34d3df4c096e7 (diff)
Merge branch 'DRTVWR-497' of bitbucket.org:lindenlab/viewer into DRTVWR-497
Diffstat (limited to '.gitignore')
-rwxr-xr-x.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 2d32e94c78..a73a85e84f 100755
--- a/.gitignore
+++ b/.gitignore
@@ -68,6 +68,7 @@ indra/web/doc/asset-upload/plugins/verify-texture
installed.xml
libraries
tarfile_tmp
+trivial_change_force_build
web/config.*
web/locale.*
web/secondlife.com.* \ No newline at end of file