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

merge changes for storm-1236

parents 09bdefab 86180db1
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 @ 5ffde6fa
...@@ -431,6 +431,7 @@ Jonathan Yap ...@@ -431,6 +431,7 @@ Jonathan Yap
STORM-1128 STORM-1128
STORM-956 STORM-956
STORM-1095 STORM-1095
STORM-1236
Kage Pixel Kage Pixel
VWR-11 VWR-11
Ken March Ken March
......
indra/newview/skins/default/xui/en/floater_snapshot.xml
+ 1
− 1
View file @ 5ffde6fa
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
save_rect="true" save_rect="true"
save_visibility="true" save_visibility="true"
title="SNAPSHOT PREVIEW" title="SNAPSHOT PREVIEW"
width="215"> width="245">
<floater.string <floater.string
name="unknown"> name="unknown">
unknown unknown
......
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