diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2020-06-23 22:03:43 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2020-06-23 22:03:43 -0400 |
commit | 77cf4588dfa0213b8166b5575868df75b411a824 (patch) | |
tree | 101bf94283b5e1967b0458e16ca21e62e80c1361 /.gitignore | |
parent | f627140cf11232bab11fdfaf66c78544cf44f3e8 (diff) | |
parent | c0087286e78098ee246ea821aefb5686ab8bda78 (diff) |
DRTVWR-476: Merge branch 'master' of lindenlab/viewer into d476
following release of D512.
Diffstat (limited to '.gitignore')
-rwxr-xr-x | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 0c0bf7645a..4af34870cf 100755 --- a/.gitignore +++ b/.gitignore @@ -71,6 +71,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 |