Ansariel 63f30264ff Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llui/lltransutil.cpp # indra/llwindow/llwindowmacosx.cpp # indra/llwindow/llwindowmacosx.h # indra/newview/app_settings/settings.xml # indra/newview/llavatarpropertiesprocessor.cpp # indra/newview/llavatarpropertiesprocessor.h # indra/newview/llinspectavatar.cpp # indra/newview/llpanelprofile.cpp # indra/newview/llpanelprofile.h # indra/newview/llviewerjoystick.cpp		2023-10-26 20:58:56 +02:00
..
LGPL-license.txt	Fix spelling error on license file name	2022-11-18 06:23:11 -05:00
LICENSE-logos.txt	merge buildcleanup	2015-06-25 12:13:10 -04:00
LICENSE-source.txt	merge buildcleanup	2015-06-25 12:13:10 -04:00
contributions.txt	Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer	2023-10-26 20:58:56 +02:00
releasenotes-where.txt	Update Mac and Windows breakpad builds to latest	2013-03-29 07:50:08 -07:00
sl-logo-dark.png	Fix readme logo for dark theme sites	2022-11-18 06:22:43 -05:00
sl-logo.png	SL-14702: Spruce up README	2021-08-02 10:10:14 -07:00
translations.txt	Update Mac and Windows breakpad builds to latest	2013-03-29 07:50:08 -07:00