Merge branch 'main' of git.alchemyviewer.org:alchemy/alchemy-next
Showing
- .gitlab-ci.yml 3 additions, 2 deletions.gitlab-ci.yml
- autobuild.xml 7 additions, 7 deletionsautobuild.xml
- indra/deps/CMakeLists.txt 1 addition, 1 deletionindra/deps/CMakeLists.txt
- indra/llcommon/llsdjson.cpp 1 addition, 1 deletionindra/llcommon/llsdjson.cpp
- indra/llcommon/llsdutil.cpp 3 additions, 3 deletionsindra/llcommon/llsdutil.cpp
- indra/llcommon/lluuid.h 0 additions, 4 deletionsindra/llcommon/lluuid.h
- indra/llinventory/llsettingsbase.cpp 8 additions, 5 deletionsindra/llinventory/llsettingsbase.cpp
- indra/llprimitive/llmaterialid.h 0 additions, 4 deletionsindra/llprimitive/llmaterialid.h
- indra/newview/installers/windows/install_template.iss 1 addition, 1 deletionindra/newview/installers/windows/install_template.iss
- indra/newview/llinventorygallery.cpp 1 addition, 1 deletionindra/newview/llinventorygallery.cpp
- indra/newview/llmaterialmgr.cpp 2 additions, 10 deletionsindra/newview/llmaterialmgr.cpp
Loading
Please register or sign in to comment