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

merge changes for storm-1725

parents 97630acc a7889428
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 @ d0c7eaa7
...@@ -595,6 +595,7 @@ Jonathan Yap ...@@ -595,6 +595,7 @@ Jonathan Yap
STORM-1674 STORM-1674
STORM-1685 STORM-1685
STORM-1721 STORM-1721
STORM-1725
STORM-1719 STORM-1719
STORM-1712 STORM-1712
STORM-1728 STORM-1728
......
indra/newview/skins/default/xui/en/panel_preferences_general.xml
+ 1
− 1
View file @ d0c7eaa7
...@@ -420,7 +420,7 @@ ...@@ -420,7 +420,7 @@
follows="left|top" follows="left|top"
height="29" height="29"
layout="topleft" layout="topleft"
left="50" left="30"
name="busy_response" name="busy_response"
width="470" width="470"
word_wrap="true"> word_wrap="true">
......
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