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

Merge branch 'master' into DRTVWR-515-maint 

# Conflicts:
#	indra/newview/llfloatereditextdaycycle.cpp
#	indra/newview/llfloaterfixedenvironment.cpp
parents dfc406f0 04c473ab
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 207 additions and 698 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