summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-03-09 12:56:48 -0500
committerOz Linden <oz@lindenlab.com>2012-03-09 12:56:48 -0500
commit0a873715677ef3fb28e8dab161acbe05ed8bd537 (patch)
tree1f2e2c804bb7764bddbcb428c71edbcdeeb3da6f /doc
parent11c6654479a299549dc0035faa894678a60e157e (diff)
parenteb7e48fc9015266fd2945873f12d925ffc6262ed (diff)
merge changes for vmrg-230
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index c1306db9b7..3851e62cfb 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -103,6 +103,7 @@ Aleric Inglewood
STORM-163
STORM-955
STORM-960
+ STORM-1793
Ales Beaumont
VWR-9352
SNOW-240
@@ -598,6 +599,7 @@ Jonathan Yap
STORM-1685
STORM-1718
STORM-1721
+ STORM-1718
STORM-1727
STORM-1725
STORM-1719
@@ -612,11 +614,17 @@ Jonathan Yap
STORM-1733
STORM-1741
STORM-1790
+ STORM-1795
STORM-1788
STORM-1803
STORM-1795
STORM-1799
STORM-1796
+ STORM-1807
+ STORM-1808
+ STORM-1809
+ STORM-1793
+ STORM-1810
Kadah Coba
STORM-1060
Jondan Lundquist
@@ -1247,6 +1255,8 @@ WolfPup Lowenhar
VWR-20741
VWR-20933
Wundur Primbee
+Xellessanova Zenith
+ STORM-1793
Xiki Luik
xstorm Radek
YongYong Francois