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

Merge branch 'master' into DRTVWR-482 

# Conflicts:
#	indra/newview/app_settings/shaders/class1/objects/previewV.glsl
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llfloatermodelpreview.cpp
parents a8df6762 d7f1c88c
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 173 additions and 116 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