diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-04-25 09:13:23 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-04-25 09:13:23 -0400 |
commit | f162693a23fe5cfda8dab3857718624033812d30 (patch) | |
tree | 0768f9ea570b248b48e4caa33103e3d55c625466 /.gitignore | |
parent | d8931c9269a90cd01f6f6ff4de83b8fb41df11d3 (diff) | |
parent | d98fc504a1d4bc292ba86acdda053c8b4598a193 (diff) |
Merge Maint YZ branch 'main' into DRTVWR-588-cleanup-timers
Diffstat (limited to '.gitignore')
-rwxr-xr-x | .gitignore | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 80eca667df..3b3666af84 100755 --- a/.gitignore +++ b/.gitignore @@ -7,9 +7,18 @@ *.pyc *.rej *.swp +*.vcxproj +*.filters +*.sln +*.depend +*.stamp +*.rc + *~ # Specific paths and/or names +CMakeCache.txt +cmake_install.cmake LICENSES build-darwin-* build-linux-* @@ -17,6 +26,10 @@ debian/files debian/secondlife-appearance-utility* debian/secondlife-viewer* indra/.distcc +indra/cmake/* +indra/out/* + +indra/packages/* build-vc80/ build-vc100/ build-vc120/ @@ -44,6 +57,7 @@ indra/newview/dbghelp.dll indra/newview/filters.xml indra/newview/fmod.dll indra/newview/fmod.log +indra/newview/fonts indra/newview/mozilla-theme indra/newview/mozilla-universal-darwin.tgz indra/newview/pilot.txt @@ -55,6 +69,7 @@ indra/newview/teleport_history.txt indra/newview/typed_locations.txt indra/newview/vivox-runtime indra/newview/skins/default/html/common/equirectangular/js +emoji_characters.xml indra/server-linux-* indra/temp indra/test/linden_file.dat @@ -73,4 +88,7 @@ tarfile_tmp trivial_change_force_build web/config.* web/locale.* -web/secondlife.com.*
\ No newline at end of file +web/secondlife.com.* + +.env +.vscode |