Ansariel a17fd2352a Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llcharacter/llkeyframemotion.cpp # indra/llcharacter/llmotioncontroller.cpp # indra/llcrashlogger/llcrashlogger.cpp # indra/llimage/llimagetga.cpp # indra/llmessage/llregionflags.h # indra/llprimitive/lldaeloader.cpp # indra/llprimitive/llmodel.cpp # indra/llrender/llrendertarget.cpp # indra/llui/llconsole.cpp # indra/llui/llkeywords.cpp # indra/llui/llscrolllistctrl.cpp # indra/llui/lltextbase.cpp # indra/llui/lltexteditor.cpp # indra/llui/llurlentry.cpp # indra/newview/llappearancemgr.cpp # indra/newview/llappviewer.cpp # indra/newview/llfloaterworldmap.cpp # indra/newview/llgiveinventory.cpp # indra/newview/llinventorybridge.cpp # indra/newview/llpanelpeople.cpp # indra/newview/llpanelpermissions.cpp # indra/newview/llpanelteleporthistory.cpp # indra/newview/llvocache.cpp		2024-06-09 16:11:24 +02:00
..
tests	Fix line endlings	2024-05-22 22:40:26 +03:00
CMakeLists.txt	Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically	2022-05-01 00:38:40 +02:00
llcontrol.cpp	Fix line endlings	2024-05-22 22:40:26 +03:00
llcontrol.h	Fix line endlings	2024-05-22 22:40:26 +03:00
llxmlnode.cpp	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-06-09 16:11:24 +02:00
llxmlnode.h	Fix line endlings	2024-05-22 22:40:26 +03:00
llxmlparser.cpp	Fix line endlings	2024-05-22 22:40:26 +03:00
llxmlparser.h	Fix line endlings	2024-05-22 22:40:26 +03:00
llxmltree.cpp	Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer	2024-06-09 16:11:24 +02:00
llxmltree.h	Fix line endlings	2024-05-22 22:40:26 +03:00