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
..
CMakeLists.txt	Revert "Linux: Stop GCC complaining about deprecated functions in target llimagej2coj"	2023-02-05 18:34:46 +11:00
llimagej2coj.cpp	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-07-09 02:25:42 +02:00
llimagej2coj.h	#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