Skip to content
Snippets Groups Projects
Forked from NiranV / Black Dragon Viewer
Source project has a limited visibility.
  • Andrey Kleshchev's avatar
    97a10325
    Merge branch 'master' (DRTVWR-557) into DRTVWR-546 · 97a10325
    Andrey Kleshchev authored
    # Conflicts:
    #	autobuild.xml
    #	doc/contributions.txt
    #	indra/cmake/GLOD.cmake
    #	indra/llcommon/tests/llprocess_test.cpp
    #	indra/newview/VIEWER_VERSION.txt
    #	indra/newview/lldrawpoolavatar.cpp
    #	indra/newview/llfloatermodelpreview.cpp
    #	indra/newview/llmodelpreview.cpp
    #	indra/newview/llviewertexturelist.cpp
    #	indra/newview/llvovolume.cpp
    #	indra/newview/viewer_manifest.py
    97a10325
    History
    Merge branch 'master' (DRTVWR-557) into DRTVWR-546
    Andrey Kleshchev authored
    # Conflicts:
    #	autobuild.xml
    #	doc/contributions.txt
    #	indra/cmake/GLOD.cmake
    #	indra/llcommon/tests/llprocess_test.cpp
    #	indra/newview/VIEWER_VERSION.txt
    #	indra/newview/lldrawpoolavatar.cpp
    #	indra/newview/llfloatermodelpreview.cpp
    #	indra/newview/llmodelpreview.cpp
    #	indra/newview/llviewertexturelist.cpp
    #	indra/newview/llvovolume.cpp
    #	indra/newview/viewer_manifest.py
Code owners
Assign users and groups as approvers for specific file changes. Learn more.