Skip to content
Snippets Groups Projects
Commit 1d458de9 authored by Andrey Lihatskiy's avatar Andrey Lihatskiy
Browse files

Merge branch 'master' into DRTVWR-515-maint

# Conflicts:
#	indra/newview/llpanelprimmediacontrols.cpp
parents e9d50aeb bac6652c
No related branches found
No related tags found
No related merge requests found
Showing
with 241 additions and 131 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment