Ansariel 478a51f8e3 Merge branch 'release/2025.06' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llxml/llcontrol.cpp # indra/newview/llfloaterpreference.cpp # indra/newview/lllogchat.cpp # indra/newview/llreflectionmap.h		2025-08-13 20:52:47 +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 'release/2025.06' of https://github.com/secondlife/viewer	2025-08-13 20:52:47 +02:00
llimagej2coj.h	Fix and optimize openjpeg J2C encoder (#4017, #4032)	2025-05-06 15:26:35 +03:00