summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-06-30 16:00:09 -0400
committerOz Linden <oz@lindenlab.com>2011-06-30 16:00:09 -0400
commit06b314aaf2d1d1176c846a3bdb17738de98252b7 (patch)
treee6fbc2b8375dfcbbab9d4e9c65935a3b38eeeda9 /doc
parent5c77e714a6febf9df23d8541064e0d2fe680ccce (diff)
parentf07173a9689237bf2d8218600c15d6bf4d047cdc (diff)
merge changes for latest viewer-development
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt9
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 729c73f777..67e78e87ee 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -103,6 +103,8 @@ Ales Beaumont
Alexandrea Fride
STORM-255
STORM-960
+ STORM-1327
+ STORM-1406
Alissa Sabre
VWR-81
VWR-83
@@ -449,7 +451,13 @@ Jonathan Yap
STORM-1313
STORM-899
STORM-1273
+ STORM-457
+ STORM-1452
+ STORM-1406
+ STORM-1327
+ STORM-1396
STORM-1292
+ STORM-1392
STORM-1302
STORM-1326
Kage Pixel
@@ -784,6 +792,7 @@ Strife Onizuka
SNOW-691
TankMaster Finesmith
STORM-1100
+ STORM-1452
Tayra Dagostino
SNOW-517
SNOW-543