phoenix-firestorm/indra/llplugin
Ansariel 45dc1a63f0 Merge branch 'DRTVWR-599-maint-Z' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llprimitive/lldaeloader.cpp
#	indra/llui/lllayoutstack.cpp
#	indra/llui/llnotifications.h
#	indra/llui/lltoolbar.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/llagent.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterimcontainer.cpp
#	indra/newview/llfloaterimnearbychathandler.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpaneloutfitsinventory.h
#	indra/newview/llsidepanelappearance.h
#	indra/newview/lltoolbarview.cpp
2024-01-12 14:18:34 +01:00
..
slplugin Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer 2023-07-25 15:06:37 +02:00
CMakeLists.txt Remove setting of HEADER_FILE_ONLY on .h* files, cmake automatically 2022-05-01 00:38:40 +02:00
llpluginclassmedia.cpp
llpluginclassmedia.h Merge branch 'DRTVWR-599-maint-Z' of https://github.com/secondlife/viewer 2024-01-12 14:18:34 +01:00
llpluginclassmediaowner.h
llplugininstance.cpp
llplugininstance.h
llpluginmessage.cpp
llpluginmessage.h
llpluginmessageclasses.h
llpluginmessagepipe.cpp
llpluginmessagepipe.h
llpluginprocesschild.cpp
llpluginprocesschild.h
llpluginprocessparent.cpp Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer 2023-01-12 16:56:08 +01:00
llpluginprocessparent.h Merge branch 'DRTVWR-599-maint-Z' of https://github.com/secondlife/viewer 2024-01-12 14:18:34 +01:00
llpluginsharedmemory.cpp
llpluginsharedmemory.h