phoenix-firestorm/indra/llplugin/slplugin
Ansariel 163ea9a5b7 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llmath/llvolume.cpp
#	indra/llmath/llvolume.h
#	indra/llmath/xform.h
#	indra/llprimitive/llmaterialtable.cpp
#	indra/llprimitive/llprimitive.h
#	indra/llrender/llfontfreetype.cpp
#	indra/llrender/llgltexture.cpp
#	indra/llrender/llgltexture.h
#	indra/llrender/llimagegl.cpp
#	indra/llrender/llimagegl.h
2024-02-20 10:49:47 +01:00
..
CMakeLists.txt Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer 2022-09-17 23:12:34 +02:00
slplugin-objc.h remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
slplugin-objc.mm replaces deprecated (since 10.12) reference to NSAnyEventMask with the replacement NSEventMaskAny. Functionality unaltered. 2023-07-21 00:25:07 +02:00
slplugin.cpp Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-20 10:49:47 +01:00
slplugin_info.plist remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00