Ansariel 82e8fd1671 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/llrender/llgl.cpp # indra/newview/app_settings/settings.xml # indra/newview/skins/default/xui/en/notifications.xml		2024-09-09 19:50:00 +02:00
..
CMakeLists.txt	…
llatmosphere.cpp	…
llatmosphere.h	…
llcubemap.cpp	…
llcubemap.h	…
llcubemaparray.cpp	…
llcubemaparray.h	…
llfontbitmapcache.cpp	…
llfontbitmapcache.h	…
llfontfreetype.cpp	…
llfontfreetype.h	…
llfontfreetypesvg.cpp	…
llfontfreetypesvg.h	…
llfontgl.cpp	…
llfontgl.h	…
llfontregistry.cpp	…
llfontregistry.h	…
llgl.cpp	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-09-09 19:50:00 +02:00
llgl.h	Merge branch 'release/2024.08-DeltaFPS' of https://github.com/secondlife/viewer	2024-09-05 01:00:39 +02:00
llglcommonfunc.cpp	…
llglcommonfunc.h	…
llglheaders.h	…
llglslshader.cpp	…
llglslshader.h	…
llglstates.h	…
llgltexture.cpp	…
llgltexture.h	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-08-21 00:46:46 +02:00
llgltypes.h	…
llimagegl.cpp	Merge branch 'release/2024.08-DeltaFPS' of https://github.com/secondlife/viewer	2024-09-05 01:00:39 +02:00
llimagegl.h	…
llpostprocess.cpp	…
llpostprocess.h	…
llrender.cpp	…
llrender.h	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-08-08 21:34:26 +02:00
llrender2dutils.cpp	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-08-08 21:34:26 +02:00
llrender2dutils.h	…
llrendernavprim.cpp	…
llrendernavprim.h	…
llrendersphere.cpp	…
llrendersphere.h	…
llrendertarget.cpp	…
llrendertarget.h	…
llshadermgr.cpp	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-08-15 00:12:13 +02:00
llshadermgr.h	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-08-15 00:12:13 +02:00
lltexture.cpp	…
lltexture.h	…
lltexturemanagerbridge.cpp	…
lltexturemanagerbridge.h	…
lluiimage.cpp	…
lluiimage.h	…
lluiimage.inl	…
llvertexbuffer.cpp	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-08-08 21:34:26 +02:00
llvertexbuffer.h	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-08-08 21:34:26 +02:00