summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-23 15:56:28 -0500
committerOz Linden <oz@lindenlab.com>2011-02-23 15:56:28 -0500
commitb246fdd74827caa7927c0aee64397a764db58df2 (patch)
treebd76f7ca0d164a219547725d41ce2bd01b5637d6 /doc
parent609c70eb5a48389bef1ad33358774764ee9615e2 (diff)
parent0a262969e1da82fc95ec889f7aaafa4078bcf480 (diff)
Automated merge with ssh://hg@bitbucket.org/lindenlab/viewer-development
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 5d59627a92..c80bc631bc 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -395,7 +395,11 @@ Jonathan Yap
STORM-869
VWR-17801
VWR-24347
+ STORM-844
STORM-975
+ STORM-643
+ STORM-960
+ STORM-953
Kage Pixel
VWR-11
Ken March