Ansariel b8a0d89dfc Merge branch 'release/2024.08-DeltaFPS' of https://github.com/secondlife/viewer ... # Conflicts: # indra/llrender/llgl.h # indra/newview/llviewermenu.cpp # indra/newview/llviewertexture.cpp # indra/newview/skins/default/xui/en/notifications.xml		2024-09-05 01:00:39 +02:00
..
class1	Merge branch 'release/2024.08-DeltaFPS' of https://github.com/secondlife/viewer	2024-09-05 01:00:39 +02:00
class2	Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600	2024-06-13 01:54:18 +02:00
class3	1736 audit texture image unit usage on os x (#1739)	2024-06-14 17:06:07 -05:00
errorF.glsl	…
errorV.glsl	…