summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-11-01 22:02:29 -0700
committerMerov Linden <merov@lindenlab.com>2010-11-01 22:02:29 -0700
commit94c41b2c00230a9514530bcd70efbe6f057a4e13 (patch)
tree405f551169b41126b5d9c93a483e8b4692916cf7 /doc
parent44f6b6ea47e843e10bcc3ce94f2c1aaa8f7f24fb (diff)
parentd3bc9b3e752935bffc5e808fd41a43af45568788 (diff)
STORM-255 : merge with viewer-development
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index b3d30c3a54..2ca5adc643 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -79,6 +79,8 @@ Aleric Inglewood
Ales Beaumont
VWR-9352
SNOW-240
+Alexandrea Fride
+ STORM-255
Alissa Sabre
VWR-81
VWR-83
@@ -754,6 +756,9 @@ Wilton Lundquist
VWR-7682
Zai Lynch
VWR-19505
+Wolfpup Lowenhar
+ STORM-255
+ STORM-256
Zarkonnen Decosta
VWR-253
Zi Ree