summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-05-04 09:36:39 -0400
committerOz Linden <oz@lindenlab.com>2011-05-04 09:36:39 -0400
commit3b79c9c81dc1ba4cb92f1ac54bd74a57e6d5aa05 (patch)
treecf27e69ff2bea8c621d1073172636146b8c73a57 /doc
parentc3df5f5d675abd107e1f0b4e3fb262226978ddb5 (diff)
parentb9bb792c478d703c6442351ecb563c0a67f77111 (diff)
merge changes for viewer-development before mesh merge
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index a19967fd4d..fc3bce2763 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -204,6 +204,7 @@ Boroondas Gupte
SNOW-624
SNOW-737
STORM-318
+ STORM-1182
VWR-233
VWR-20583
VWR-20891
@@ -243,6 +244,7 @@ Coaldust Numbers
Cron Stardust
VWR-10579
VWR-25120
+ STORM-1075
Cypren Christenson
STORM-417
Dale Glass
@@ -424,6 +426,8 @@ Jonathan Yap
STORM-1094
STORM-1077
STORM-953
+ STORM-1128
+ STORM-956
STORM-1095
Kage Pixel
VWR-11
@@ -662,6 +666,7 @@ Robin Cornelius
STORM-960
STORM-1019
STORM-1095
+ STORM-1128
VWR-2488
VWR-9557
VWR-10579
@@ -799,6 +804,7 @@ Thickbrick Sleaford
VWR-13483
VWR-13947
VWR-24420
+ STORM-956
STORM-1147
Thraxis Epsilon
SVC-371