Skip to content
Snippets Groups Projects
Commit 255eebf1 authored by Oz Linden's avatar Oz Linden
Browse files

merge changes for storm-1638

parents 897dc395 aa341e91
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
doc/contributions.txt
+ 1
− 0
View file @ 255eebf1
...@@ -576,6 +576,7 @@ Jonathan Yap ...@@ -576,6 +576,7 @@ Jonathan Yap
STORM-1572 STORM-1572
STORM-1574 STORM-1574
STORM-1579 STORM-1579
STORM-1638
STORM-976 STORM-976
STORM-1639 STORM-1639
STORM-910 STORM-910
......
indra/newview/skins/default/xui/en/floater_model_wizard.xml
+ 1
− 1
View file @ 255eebf1
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
height="10" height="10"
layout="topleft" layout="topleft"
left="10" left="10"
name="Cache location" name="Model types"
width="320"> width="320">
Second Life supports COLLADA (.dae) files Second Life supports COLLADA (.dae) files
</text> </text>
......
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