summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2020-06-24 00:09:38 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2020-06-24 00:09:38 +0300
commitadb8d70840b36ba64fe80dfd569b3822ead4769c (patch)
treec0a1b84ccad15056cae25eeae9bc10d2f76f16a9 /.gitignore
parent59b10c2cbcb3bbe8b88cd9c7dba17b0e28d56a9b (diff)
parentc0087286e78098ee246ea821aefb5686ab8bda78 (diff)
Merge branch 'master' into DRTVWR-507-maint
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