Ansariel 00464b15cd Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llui/llfolderviewitem.cpp # indra/llui/llui.h # indra/llxml/llcontrol.cpp # indra/newview/app_settings/settings.xml # indra/newview/llfloateravatarpicker.cpp # indra/newview/llimprocessing.cpp # indra/newview/llnavigationbar.cpp # indra/newview/lltextureview.cpp # indra/newview/lltoolpie.cpp # indra/newview/llvieweraudio.cpp # indra/newview/llviewercontrol.cpp # indra/newview/llviewerwindow.cpp		2023-09-22 20:47:05 +02:00
..
tests	…
CMakeLists.txt	Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically	2022-05-01 00:38:40 +02:00
llcontrol.cpp	Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer	2023-09-22 20:47:05 +02:00
llcontrol.h	Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer	2022-01-15 02:39:07 +01:00
llxmlnode.cpp	…
llxmlnode.h	…
llxmlparser.cpp	…
llxmlparser.h	…
llxmltree.cpp	…
llxmltree.h	…