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

Merge branch 'DRTVWR-522-maint' into DRTVWR-545-maint-mix 

# Conflicts:
#	indra/newview/llappviewer.cpp
#	indra/newview/llappviewerwin32.cpp
#	indra/newview/llmachineid.cpp
parents b12dd38c f949415a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 145 additions and 1222 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