summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-05 17:53:37 -0500
committerOz Linden <oz@lindenlab.com>2011-01-05 17:53:37 -0500
commiteb0b8ab3ea19617a52881191bab21bfedcc5696d (patch)
tree769aa9bd60f45109f54672db93a4fa22fcde6510 /doc
parentdf0a0312fb1923164c6d693c675a365bb8cef1df (diff)
parentd5a0c56bf5d933b7cee072cbc1851a626e672ded (diff)
merge changes for storm-825
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 2e4fceeb7b..d7a5f73ac0 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -364,12 +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
@@ -748,6 +749,8 @@ Tue Torok
CT-74
Twisted Laws
SNOW-352
+ STORM-466
+ STORM-467
Vadim Bigbear
VWR-2681
Vector Hastings