summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-12-03 10:41:46 -0500
committerLoren Shih <seraph@lindenlab.com>2010-12-03 10:41:46 -0500
commit963e3346b1c81590d0c31097912e6481515f3722 (patch)
treef9cb9ea89baf41175ab4be753f189f7d024a6bd5 /doc
parent1ef5278bd6eb89fb4c68f92d86a165a0b314fd50 (diff)
parent36954908632d6f5366f6517023676c1bcd71aa17 (diff)
Automated merge up from viewer-development
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 3f0d842643..2d6b20c51d 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -357,6 +357,8 @@ Joghert LeSabre
Jonathan Yap
VWR-17801
STORM-616
+ STORM-679
+ STORM-596
Kage Pixel
VWR-11
Ken March