Ansariel 3d9414c1f2 Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llui/llfloaterreg.cpp # indra/llui/llnotifications.cpp # indra/llui/llpanel.cpp # indra/llui/llui.cpp # indra/llui/lluicolortable.cpp # indra/llui/lluicolortable.h # indra/newview/llappviewer.h # indra/newview/llfloatersidepanelcontainer.cpp # indra/newview/llfloatersidepanelcontainer.h # indra/newview/llpanelpeoplemenus.cpp # indra/newview/llviewermenufile.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/skins/default/xui/en/notifications.xml		2024-07-03 01:11:47 +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	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-07-03 01:11:47 +02:00
llcontrol.h	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-07-03 01:11:47 +02:00
llxmlnode.cpp	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-07-02 18:08:57 +02:00
llxmlnode.h	#1111 Remove xmlrpc-epi	2024-07-01 20:20:04 +02: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