Commits

Scott Lawrence committed d23ff7d Merge

merge changes for storm-1895

  • Participants
  • Parent commits 21fa8e3, 16b42be

Comments (0)

Files changed (2)

File doc/contributions.txt

 Westley Schridde
 Westley Streeter
 Whimsy Winx
+Whirly Fizzle
+	STORM-1895
 Whoops Babii
 	VWR-631
 	VWR-1640

File indra/newview/skins/default/xui/en/panel_region_debug.xml

      layout="topleft"
      left_pad="155"
      name="cancel_restart_btn"
-     tool_tip="Delay region restart by one hour"
+     tool_tip="Cancel region restart"
      top_delta="0"
      width="150" />
 </panel>