Ansariel c29a661b22 Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600 ... # Conflicts: # indra/llimage/llimage.cpp # indra/llprimitive/llgltfmaterial.h # indra/llrender/llglslshader.cpp # indra/newview/app_settings/shaders/class1/deferred/pbrterrainF.glsl # indra/newview/app_settings/shaders/class1/deferred/terrainF.glsl # indra/newview/app_settings/shaders/class2/deferred/pbralphaF.glsl # indra/newview/gltf/accessor.cpp # indra/newview/gltf/accessor.h # indra/newview/gltf/animation.h # indra/newview/gltf/asset.cpp # indra/newview/gltf/primitive.cpp # indra/newview/gltf/primitive.h # indra/newview/gltfscenemanager.h # indra/newview/llenvironment.cpp # indra/newview/llfetchedgltfmaterial.cpp # indra/newview/llfloaterregioninfo.h # indra/newview/llimprocessing.cpp # indra/newview/lltexturectrl.cpp # indra/newview/lltinygltfhelper.cpp # indra/newview/llviewermenu.cpp # indra/newview/llvlcomposition.cpp # indra/newview/llvlcomposition.h # indra/newview/llvovolume.cpp # indra/newview/pipeline.cpp		2024-06-13 01:54:18 +02:00
..
deferred	Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600	2024-06-13 01:54:18 +02:00
interface	#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