summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2020-06-24 00:11:01 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2020-06-24 00:11:01 +0300
commitb3048950927e1c87c0a2cb06b9317957a04398ee (patch)
tree83d3d930c0b0870fab4412e5f001f7de9577be1b /.gitignore
parent70fb39c69f6b4fb4168e8ba1118e7af697899917 (diff)
parentc0087286e78098ee246ea821aefb5686ab8bda78 (diff)
Merge branch 'master' into DRTVWR-482
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