Skip to content

Commit 17c5300

Browse files
committed
chore: drop unrelated .gitignore/.gitattributes changes
1 parent 9d88757 commit 17c5300

File tree

2 files changed

+126
-12
lines changed

2 files changed

+126
-12
lines changed

.gitattributes

Lines changed: 35 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,35 @@
1-
# Normalize text files to LF
2-
*.md text eol=lf
3-
*.cmake text eol=lf
4-
*.cpp text eol=lf
5-
*.cxx text eol=lf
6-
*.cc text eol=lf
7-
*.h text eol=lf
8-
*.hpp text eol=lf
9-
*.hh text eol=lf
1+
* text eol=lf
2+
3+
# Images
4+
*.bmp binary
5+
*.BMP binary
6+
*.gif binary
7+
*.icns binary
8+
*.ico binary
9+
*.j2c binary
10+
*.j2k binary
11+
*.jpg binary
12+
*.png binary
13+
*.tga binary
14+
*.tif binary
15+
16+
# Viewer resources
17+
*.db2 binary
18+
*.llm binary
19+
*.nib binary
20+
*.rtf binary
21+
*.ttf binary
22+
23+
# Executables
24+
*.dll binary
25+
*.exe binary
26+
27+
# Files with Windows line endings
28+
VivoxAUP.txt text eol=crlf
29+
FILES_ARE_UNICODE_UTF-16LE.txt text eol=crlf
30+
31+
# Windows Manifest files
32+
*.manifest text eol=crlf
33+
34+
# Windows Installer Script files (normalization disabled)
35+
*.nsi -text

.gitignore

Lines changed: 91 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,93 @@
1+
# By extension
2+
*.DS_Store
3+
*.bak
4+
*.diff
5+
*.orig
6+
*.patch
7+
*.pyc
8+
*.rej
9+
*.swp
10+
*.vcxproj
11+
*.filters
12+
*.sln
13+
*.depend
14+
*.stamp
15+
*.rc
116

2-
# local-only
3-
.prepr/
4-
.build-variables/
17+
*~
518

19+
# Specific paths and/or names
20+
CMakeCache.txt
21+
cmake_install.cmake
22+
LICENSES
23+
build-darwin-*
24+
build-linux-*
25+
debian/files
26+
debian/secondlife-appearance-utility*
27+
debian/secondlife-viewer*
28+
indra/.distcc
29+
indra/out/*
30+
31+
indra/packages/*
32+
build-vc80/
33+
build-vc100/
34+
build-vc120/
35+
build-vc*-32/
36+
build-vc*-64/
37+
indra/CMakeFiles
38+
indra/build-vc[0-9]*
39+
indra/lib/mono/1.0/*.dll
40+
indra/lib/mono/indra/*.dll
41+
indra/lib/mono/indra/*.exe
42+
indra/lib/mono/indra/*.pdb
43+
indra/lib/python/eventlet/
44+
indra/lib/python/mulib.*
45+
indra/llwindow/glh/glh_linear.h
46+
indra/newview/app_settings/dictionaries
47+
indra/newview/app_settings/mozilla
48+
indra/newview/app_settings/mozilla-runtime-*
49+
indra/newview/app_settings/mozilla_debug
50+
indra/newview/app_settings/static_*.db2
51+
indra/newview/avatar_icons_cache.txt
52+
indra/newview/avatar_lad.log
53+
indra/newview/browser_profile
54+
indra/newview/character
55+
indra/newview/dbghelp.dll
56+
indra/newview/filters.xml
57+
indra/newview/fmod.dll
58+
indra/newview/fmod.log
59+
indra/newview/fonts
60+
indra/newview/mozilla-theme
61+
indra/newview/mozilla-universal-darwin.tgz
62+
indra/newview/pilot.txt
63+
indra/newview/pilot.xml
64+
indra/newview/res-sdl/ll_icon.*
65+
indra/newview/res/ll_icon.*
66+
indra/newview/search_history.txt
67+
indra/newview/teleport_history.txt
68+
indra/newview/typed_locations.txt
69+
indra/newview/vivox-runtime
70+
indra/newview/skins/default/html/common/equirectangular/js
71+
emoji_characters.xml
72+
indra/server-linux-*
73+
indra/temp
74+
indra/test/linden_file.dat
75+
indra/test_apps/llmediatest/dependencies/i686-win32
76+
indra/test_apps/terrain_mule/*.dll
77+
indra/viewer-linux-*
78+
indra/web/dataservice/lib/shared/vault.*
79+
indra/web/dataservice/locale.*
80+
indra/web/dataservice/vendor.*
81+
indra/web/doc/asset-upload/plugins/lsl_compiler/lslc
82+
indra/web/doc/asset-upload/plugins/verify-notecard
83+
indra/web/doc/asset-upload/plugins/verify-texture
84+
installed.xml
85+
libraries
86+
tarfile_tmp
87+
trivial_change_force_build
88+
web/config.*
89+
web/locale.*
90+
web/secondlife.com.*
91+
92+
.env
93+
.vscode

0 commit comments

Comments
 (0)