Skip to content
Snippets Groups Projects
Forked from Alchemy Viewer / Alchemy Viewer
Source project has a limited visibility.
  • Andrey Lihatskiy's avatar
    3da7a50b
    Merge branch 'master' into DRTVWR-543-maint · 3da7a50b
    Andrey Lihatskiy authored
    # Conflicts:
    #	autobuild.xml
    #	indra/cmake/LLCommon.cmake
    #	indra/llcommon/CMakeLists.txt
    #	indra/llrender/llgl.cpp
    #	indra/newview/llappviewer.cpp
    #	indra/newview/llface.cpp
    #	indra/newview/llflexibleobject.cpp
    #	indra/newview/llvovolume.cpp
    3da7a50b
    History
    Merge branch 'master' into DRTVWR-543-maint
    Andrey Lihatskiy authored
    # Conflicts:
    #	autobuild.xml
    #	indra/cmake/LLCommon.cmake
    #	indra/llcommon/CMakeLists.txt
    #	indra/llrender/llgl.cpp
    #	indra/newview/llappviewer.cpp
    #	indra/newview/llface.cpp
    #	indra/newview/llflexibleobject.cpp
    #	indra/newview/llvovolume.cpp
Code owners
Assign users and groups as approvers for specific file changes. Learn more.