Post-git conversion changes
parent
7a12a8546c
commit
9e0bbc4e10
|
|
@ -0,0 +1,29 @@
|
|||
* text=auto
|
||||
|
||||
# Sources
|
||||
*.cpp text diff=cpp
|
||||
*.h text diff=cpp
|
||||
*.py text diff=python
|
||||
|
||||
# Documents
|
||||
*.txt text
|
||||
*.xml text
|
||||
|
||||
# Graphics
|
||||
*.png binary diff=exif
|
||||
*.jpg binary diff=exif
|
||||
*.jpeg binary diff=exif
|
||||
*.gif binary diff=exif
|
||||
*.tif binary
|
||||
*.tiff binary
|
||||
*.ico binary
|
||||
*.svg text
|
||||
*.eps binary
|
||||
|
||||
# Scripts
|
||||
*.sh text eol=lf
|
||||
*.bat text eol=crlf
|
||||
|
||||
# Exclude files from exporting
|
||||
.gitattributes export-ignore
|
||||
.gitignore export-ignore
|
||||
|
|
@ -1,5 +1,3 @@
|
|||
syntax: glob
|
||||
|
||||
# WinMerge temp files
|
||||
*.bak
|
||||
# Compiled python bytecode
|
||||
|
|
@ -58,25 +56,18 @@ debian/secondlife-appearance-utility*
|
|||
debian/files
|
||||
build-stamp
|
||||
configure-stamp
|
||||
^indra/lib/python/mulib.*
|
||||
^web/locale.*
|
||||
^web/secondlife.com.*
|
||||
^web/config.*
|
||||
^indra/web/dataservice/locale.*
|
||||
^indra/web/dataservice/lib/shared/vault.*
|
||||
^indra/web/dataservice/vendor.*
|
||||
glob:indra/newview/dbghelp.dll
|
||||
glob:*.cpp.orig
|
||||
glob:*.cpp.bak
|
||||
glob:*.h.bak
|
||||
glob:*.h.orig
|
||||
glob:indra/newview/typed_locations.txt
|
||||
glob:indra/newview/teleport_history.txt
|
||||
glob:indra/newview/search_history.txt
|
||||
glob:indra/newview/filters.xml
|
||||
glob:indra/newview/avatar_icons_cache.txt
|
||||
glob:indra/newview/avatar_lad.log
|
||||
glob:*.diff
|
||||
indra/newview/dbghelp.dll
|
||||
*.cpp.orig
|
||||
*.cpp.bak
|
||||
*.h.bak
|
||||
*.h.orig
|
||||
indra/newview/typed_locations.txt
|
||||
indra/newview/teleport_history.txt
|
||||
indra/newview/search_history.txt
|
||||
indra/newview/filters.xml
|
||||
indra/newview/avatar_icons_cache.txt
|
||||
indra/newview/avatar_lad.log
|
||||
*.diff
|
||||
indra/newview/pilot.txt
|
||||
indra/newview/pilot.xml
|
||||
*.rej
|
||||
12
.hgeol
12
.hgeol
|
|
@ -1,12 +0,0 @@
|
|||
[repository]
|
||||
native = LF
|
||||
|
||||
[patterns]
|
||||
path:indra/lscript/lscript_compile/windows/unistd.h = CRLF
|
||||
path:indra/newview/installers/windows/FILES_ARE_UNICODE_UTF-16LE.txt = CRLF
|
||||
path:indra/tools/vstool/README.txt = CRLF
|
||||
**.h = native
|
||||
**.cpp = native
|
||||
**.py = native
|
||||
**.xml = native
|
||||
**.txt = native
|
||||
|
|
@ -1 +0,0 @@
|
|||
1e18a3ddad1af651a5f20af19172afa2937baed2
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
[Viewer/Build]
|
||||
* Enforce EOL consistency through .hgeol
|
||||
* Removed LL's changeset tags and added new (consistent) SL-X.Y.Z tags for releases
|
||||
* Break into the debugger rather than forcing the process into an unrecoverable state for "llerrs" on non-release builds
|
||||
-> Windows only
|
||||
* Use the current virtualenv's python rather than the system default
|
||||
-> Windows-only
|
||||
* CATZ-234: Updated FMOD Ex library to v4.44.61 (Windows)
|
||||
* CATZ-232: Updated OpenJPEG library to v1.5.2 (Windows)
|
||||
* [FIXED] Viewer fails to compile with only the Windows 8/10 SDK installed
|
||||
Loading…
Reference in New Issue