summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-04-18 16:25:02 -0400
committerOz Linden <oz@lindenlab.com>2011-04-18 16:25:02 -0400
commit9c995e2a5ce45cc912605d077d704fa76ed904dd (patch)
tree2f790ce33f92bff08ee64c45cfee4ad8ea62f4a5 /doc
parent853231580aa2a6bf2894c20495c549a9d5f3c673 (diff)
parent81676d4753a1abe347a69a95f234a005aad0659f (diff)
merge up from viewer-development (with changes for storm-160 backed out)
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 ff982ec61a..e7db8c0ded 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -155,6 +155,8 @@ Angus Boyd
VWR-592
Ann Congrejo
CT-193
+Ansariel Hiller
+ STORM-1101
Ardy Lay
VWR-19499
VWR-24917
@@ -417,6 +419,7 @@ Jonathan Yap
STORM-1020
STORM-1064
STORM-960
+ STORM-1101
STORM-1108
STORM-1094
STORM-1077
@@ -869,6 +872,7 @@ WolfPup Lowenhar
STORM-674
STORM-776
STORM-825
+ STORM-1098
VWR-20741
VWR-20933
Zai Lynch