summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorDave Houlton <euclid@lindenlab.com>2020-06-23 16:20:34 -0600
committerDave Houlton <euclid@lindenlab.com>2020-06-23 16:20:34 -0600
commitcb9ce206a9d8d47c32244501f916bb79de753610 (patch)
tree34f724b3aaa4dbdefe8fe79fd11370f9242596b3 /.gitignore
parentbad9314c30be88a5021f953a4aa88e68b5b094f3 (diff)
parentc0087286e78098ee246ea821aefb5686ab8bda78 (diff)
Merge branch 'master' 6.4.5 into DRTVWR-510
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