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

merge changes for storm-1522

parents 7f061793 36f9b513
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 @ a2c59446
......@@ -567,6 +567,7 @@ Jonathan Yap
STORM-1276
STORM-1462
STORM-1459
STORM-1522
Kadah Coba
STORM-1060
Jondan Lundquist
......
indra/newview/skins/default/xui/en/panel_region_terrain.xml
+ 1
− 1
View file @ a2c59446
......@@ -193,7 +193,7 @@
</text>
<text
follows="left|top"
height="20"
height="60"
layout="topleft"
left_delta="0"
name="height_text_lbl11"
......
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