summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-04 16:44:15 -0500
committerOz Linden <oz@lindenlab.com>2011-01-04 16:44:15 -0500
commit562ed9c4d463ccb96dd4e6b23dff6ad6c845fc96 (patch)
treee818a654c4c45cd9110164b932669cb5036c6e45 /doc
parent43659aac93ff5041bbf94bcaa66e88bc4b70a6cd (diff)
parent05810f063dbe0ed87d03ea41c7d8fdc423945c6e (diff)
merge changes for storm-485
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 5a8881a85f..b983fb481c 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -364,11 +364,13 @@ JB Kraft
Joghert LeSabre
VWR-64
Jonathan Yap
- VWR-17801
+ STORM-596
+ STORM-523
STORM-616
STORM-679
- STORM-596
+ STORM-737
STORM-726
+ VWR-17801
STORM-785
Kage Pixel
VWR-11
@@ -747,6 +749,7 @@ Tue Torok
CT-74
Twisted Laws
SNOW-352
+ STORM-466
Vadim Bigbear
VWR-2681
Vector Hastings