Skip to content
Snippets Groups Projects
Forked from NiranV / Black Dragon Viewer
Source project has a limited visibility.
  • Andrey Kleshchev's avatar
    3d73a10d
    Merge branch main (DRTVWR-582) into DRTVWR-567 · 3d73a10d
    Andrey Kleshchev authored
    # Conflicts:
    #	indra/newview/app_settings/settings.xml
    #	indra/newview/llinventoryfunctions.cpp
    #	indra/newview/llinventoryfunctions.h
    #	indra/newview/llinventorymodel.cpp
    #	indra/newview/llinventoryobserver.cpp
    #	indra/newview/llinventoryobserver.h
    #	indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
    3d73a10d
    History
    Merge branch main (DRTVWR-582) into DRTVWR-567
    Andrey Kleshchev authored
    # Conflicts:
    #	indra/newview/app_settings/settings.xml
    #	indra/newview/llinventoryfunctions.cpp
    #	indra/newview/llinventoryfunctions.h
    #	indra/newview/llinventorymodel.cpp
    #	indra/newview/llinventoryobserver.cpp
    #	indra/newview/llinventoryobserver.h
    #	indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
Code owners
Assign users and groups as approvers for specific file changes. Learn more.