summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/xui/en/favorites_bar_button.xml
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-08-06 16:40:00 +0300
committerAndrey Lihatskiy <alihatskiy@productengine.com>2024-08-06 16:40:00 +0300
commit2795fe9786c96b057dee4ce6f4fd1504117e6f78 (patch)
treeb88e8b0ae7f62a51bd0df0894a61d1fb97f8235b /indra/newview/skins/default/xui/en/favorites_bar_button.xml
parentfd15b4309b126fd5f83f2091c060a6043e18fdbf (diff)
parent75455d101c9535d0d45aa0f505f888f4ba3de64d (diff)
Merge branch 'develop' into marchcat/b-sync
# Conflicts: # .github/workflows/build.yaml # autobuild.xml # indra/cmake/Audio.cmake # indra/cmake/Copy3rdPartyLibs.cmake # indra/llxml/llxmltree.cpp # indra/newview/viewer_manifest.py
Diffstat (limited to 'indra/newview/skins/default/xui/en/favorites_bar_button.xml')
0 files changed, 0 insertions, 0 deletions