summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-11-27 11:18:52 -0500
committerOz Linden <oz@lindenlab.com>2012-11-27 11:18:52 -0500
commitcceeacc72620ab2e5b0fb608f2974e4af694a6d5 (patch)
tree6cacf606bbb6340755174e4f80012224fc7fff7b /doc
parentc57a40da173bb0622d56771ec9ab9998c3f74e28 (diff)
parentc3d6211b346195110314e25485ff4ff2a752f950 (diff)
merge storm-1855 to latest 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 f18985adcd..4120e3bc8f 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -496,6 +496,8 @@ Ima Mechanique
STORM-959
STORM-1175
STORM-1708
+ STORM-1855
+ VWR-20553
Imnotgoing Sideways
Inma Rau
Innula Zenovka
@@ -639,6 +641,8 @@ Jonathan Yap
STORM-1793
STORM-1810
STORM-1877
+ STORM-1892
+ STORM-1894
STORM-1860
STORM-1852
STORM-1870
@@ -1033,6 +1037,7 @@ Satanello Miami
Satomi Ahn
STORM-501
STORM-229
+ VWR-20553
VWR-24502
Scrim Pinion
Scrippy Scofield