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

Merge branch 'master' into DRTVWR-544-maint 

# Conflicts:
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelface.h
#	indra/newview/llpanelobject.cpp
parents 3f6c9e2f 9dba9f80
No related branches found
No related tags found
1 merge request!83Merge Linden 6.6.7
Hide whitespace changes
Inline Side-by-side
Showing
with 511 additions and 111 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