Ansariel 68e5f326b3 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # .gitignore # indra/cmake/00-Common.cmake # indra/cmake/CMakeLists.txt # indra/cmake/GLEXT.cmake # indra/cmake/LLCommon.cmake # indra/cmake/LLMath.cmake # indra/cmake/LLRender.cmake # indra/cmake/Tracy.cmake # indra/llprimitive/CMakeLists.txt # indra/llrender/llglheaders.h # indra/llrender/llglslshader.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/llface.cpp # indra/newview/lltexturefetch.h # indra/newview/llviewerobjectlist.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvopartgroup.cpp # indra/newview/llxmlrpctransaction.cpp		2023-03-31 18:54:16 +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 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2023-02-10 10:52:46 +01:00
llimagej2coj.h	MAINT-6584: Convert LLImage class hierarchy to standard 'bool'	2016-07-22 11:35:23 -04:00