-
- Downloads
Merge remote-tracking branch 'origin/master' into DRTVWR-540-maint
# Conflicts: # autobuild.xml # indra/newview/CMakeLists.txt # indra/newview/installers/darwin/apple-notarize.sh # indra/newview/llappviewermacosx.cpp # indra/newview/llappviewerwin32.h # indra/newview/viewer_manifest.py # indra/win_crash_logger/llcrashloggerwindows.cpp
No related branches found
No related tags found
Showing
- autobuild.xml 7 additions, 7 deletionsautobuild.xml
- build.sh 27 additions, 7 deletionsbuild.sh
- indra/CMakeLists.txt 0 additions, 11 deletionsindra/CMakeLists.txt
- indra/newview/CMakeLists.txt 2 additions, 65 deletionsindra/newview/CMakeLists.txt
- indra/newview/VIEWER_VERSION.txt 1 addition, 1 deletionindra/newview/VIEWER_VERSION.txt
- indra/newview/installers/darwin/apple-notarize.sh 54 additions, 0 deletionsindra/newview/installers/darwin/apple-notarize.sh
- indra/newview/llappviewer.cpp 3 additions, 1 deletionindra/newview/llappviewer.cpp
- indra/newview/llappviewermacosx.cpp 1 addition, 30 deletionsindra/newview/llappviewermacosx.cpp
- indra/newview/llappviewerwin32.h 0 additions, 1 deletionindra/newview/llappviewerwin32.h
- indra/newview/llsecapi.cpp 6 additions, 0 deletionsindra/newview/llsecapi.cpp
- indra/newview/llsecapi.h 2 additions, 0 deletionsindra/newview/llsecapi.h
- indra/newview/slplugin.entitlements 8 additions, 0 deletionsindra/newview/slplugin.entitlements
- indra/newview/viewer_manifest.py 7 additions, 6 deletionsindra/newview/viewer_manifest.py
- indra/win_crash_logger/llcrashloggerwindows.cpp 0 additions, 536 deletionsindra/win_crash_logger/llcrashloggerwindows.cpp
Loading
Please register or sign in to comment