summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@lindenlab.com>2010-11-17 13:25:32 -0800
committerBryan O'Sullivan <bos@lindenlab.com>2010-11-17 13:25:32 -0800
commit3a36ed079c0dec55efe9622d9ff86ae932ef9ed5 (patch)
treeb298908a2ac37250a4eb3bf3a550c6f3543f05c0 /doc
parentcde71466ec4a2eb562d3316c3dafb38b8a7b0629 (diff)
parent669d10a4ee4c9cb2d6860126740f07b0ee90f29b (diff)
Merge with viewer-development
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 7773de47f8..eabbbe87b5 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -767,6 +767,8 @@ WolfPup Lowenhar
STORM-102
STORM-103
STORM-143
+ STORM-535
+ STORM-544
VWR-20741
VWR-20933
Zai Lynch