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

Merge branch 'master' into DRTVWR-518-ui 

# Conflicts:
#	indra/newview/llfloaterfixedenvironment.cpp
#	indra/newview/skins/default/xui/en/strings.xml
parents a91e2273 ce65bc2f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 254 additions and 113 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment