summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-06 14:32:01 -0500
committerOz Linden <oz@lindenlab.com>2011-01-06 14:32:01 -0500
commit94fbf99ac2e325a75a016e2f4c3b12cf8c82fc7c (patch)
tree0f1aa2cbd03f47adf17f39e6bca8e7d5e4ac165c /doc
parentf1fd558dddf43277e024cb918c371d94d0764910 (diff)
parenta9686db3e606ec45d23265fd34a1a35498f39857 (diff)
merge changes for storm-714
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index f987cf4852..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
@@ -796,6 +799,7 @@ WolfPup Lowenhar
STORM-654
STORM-674
STORM-776
+ STORM-825
VWR-20741
VWR-20933
Zai Lynch