Ansariel 088cc2ea35 Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llcommon/llpointer.h # indra/llcommon/llqueuedthread.cpp # indra/llfilesystem/llfilesystem.cpp # indra/llui/llconsole.cpp # indra/llui/llkeywords.cpp # indra/llui/llstatgraph.cpp # indra/llui/llvirtualtrackball.cpp # indra/newview/llagentcamera.cpp # indra/newview/llappviewer.cpp # indra/newview/llfloateremojipicker.cpp # indra/newview/llfloaterimnearbychathandler.cpp # indra/newview/llfloatersettingsdebug.cpp # indra/newview/llfloatersnapshot.cpp # indra/newview/llglsandbox.cpp # indra/newview/llnetmap.cpp # indra/newview/llpanelface.cpp # indra/newview/llpanelpermissions.cpp # indra/newview/llpanelplaceprofile.cpp # indra/newview/llstartup.cpp # indra/newview/llviewermessage.cpp # indra/newview/llvocache.cpp # indra/newview/llworldmapview.cpp		2024-07-09 02:25:42 +02:00
..
base	#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed	2024-04-29 07:56:09 +03:00
cef	Merge remote-tracking branch 'LL/DRTVWR-600-maint-A'	2024-05-22 23:53:27 +02:00
example	Merge remote-tracking branch 'LL/marchcat/x-ws-merge'	2024-05-01 12:30:57 +02:00
gstreamer010	Merge remote-tracking branch 'LL/marchcat/x-ws-merge'	2024-05-01 12:30:57 +02:00
gstreamer10	Merge remote-tracking branch 'LL/marchcat/x-ws-merge'	2024-05-01 12:30:57 +02:00
libvlc	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-07-09 02:25:42 +02:00
CMakeLists.txt	Linux: Initial work to fix broken build, restore gstreamer 1.0	2023-03-23 21:56:53 +11:00