summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2020-06-23 23:58:52 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2020-06-23 23:58:52 +0300
commit05f3287512557cd4cb41de7a8fe3f5171a48481d (patch)
treef43de01e3c874ba335862dff364e4b0082563dd7 /.gitignore
parentf8137f68a0f157c7dc7766a695a62d59b4198291 (diff)
parentc0087286e78098ee246ea821aefb5686ab8bda78 (diff)
Merge branch 'master' into DRTVWR-501-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