diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-25 20:02:12 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2021-12-25 20:02:32 +0200 |
| commit | 693d9dc3bd608a5777dc8f6ac5f73b3ab796d392 (patch) | |
| tree | 222b36d46323afb235139ce73ddbd13ad75e4494 /.gitignore | |
| parent | 098c4c0371f63b2b827131a13bfc623b8cb73f25 (diff) | |
| parent | 0a873cd95547f003878c6d00d0883ff792f4a865 (diff) | |
Merge master into DRTVWR-486
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 |