summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-21 07:20:18 -0500
committerOz Linden <oz@lindenlab.com>2011-01-21 07:20:18 -0500
commit5f997751fe4e55ad3c8a62bcfcdd91752f613903 (patch)
treeb40caf3240af0fb9f071022c6c17eb66e9a239a3 /doc
parent7461f1ca2be2851b76ded50d2eb9c0fcc46cfd5f (diff)
parent4f3953763de478b15ec6adc5c468b19a0e13bfe8 (diff)
merge changes for storm-383
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index f21354b406..1ec878846d 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -72,6 +72,7 @@ Aleric Inglewood
VWR-10837
VWR-12691
VWR-12984
+ VWR-13040
VWR-13996
VWR-14426
VWR-24247
@@ -79,6 +80,9 @@ Aleric Inglewood
VWR-24252
VWR-24254
VWR-24261
+ VWR-24315
+ VWR-24317
+ VWR-24320
SNOW-84
SNOW-477
SNOW-744
@@ -393,6 +397,7 @@ Kitty Barnett
STORM-288
STORM-799
STORM-800
+ VWR-24217
Kunnis Basiat
VWR-82
VWR-102
@@ -736,6 +741,7 @@ Thickbrick Sleaford
VWR-9287
VWR-13483
VWR-13947
+ VWR-24420
Thraxis Epsilon
SVC-371
VWR-383