summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-01-05 15:10:39 -0500
committerLoren Shih <seraph@lindenlab.com>2011-01-05 15:10:39 -0500
commit7c7527b6727a6070fd7679ea28e4e2692452bf27 (patch)
tree149af6391cf0e751488964871e8bfcf62adbb160 /doc
parentdf1c6d2a2e4ccfe7bd19a66ba95c4f7bc6edee5e (diff)
parente2f197b6f77592c84d0c2967cc0e8110c79f2f49 (diff)
Automated merge up from viewer-development
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt7
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 32ae801d19..212dffda31 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -366,12 +366,13 @@ JB Kraft
Joghert LeSabre
VWR-64
Jonathan Yap
- VWR-17801
+ STORM-596
STORM-523
STORM-616
STORM-679
- STORM-596
+ STORM-737
STORM-726
+ VWR-17801
STORM-785
Kage Pixel
VWR-11
@@ -750,6 +751,8 @@ Tue Torok
CT-74
Twisted Laws
SNOW-352
+ STORM-466
+ STORM-467
Vadim Bigbear
VWR-2681
Vector Hastings