diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-12-15 21:50:40 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-12-15 21:50:40 +0200 |
commit | edb629352822d4c7737aff2e5b719b36eadfeb50 (patch) | |
tree | 0bb17e8f0904e3e3e5e5976dafa5f1095758f3b8 /.gitignore | |
parent | 3209ad92d698c804b15d2f69f7aa1d29067f7fe0 (diff) | |
parent | 0a873cd95547f003878c6d00d0883ff792f4a865 (diff) |
Merge branch 'master' into DRTVWR-530-maint
Diffstat (limited to '.gitignore')
-rwxr-xr-x | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 4af34870cf..355c39de70 100755 --- a/.gitignore +++ b/.gitignore @@ -56,6 +56,7 @@ indra/newview/search_history.txt indra/newview/teleport_history.txt indra/newview/typed_locations.txt indra/newview/vivox-runtime +indra/newview/skins/default/html/common/equirectangular/js indra/server-linux-* indra/temp indra/test/linden_file.dat |