summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-03-31 16:40:57 -0400
committerLoren Shih <seraph@lindenlab.com>2011-03-31 16:40:57 -0400
commit8ccf3fbe3ba49c47da85527bcf6cdbded6fa9183 (patch)
treeedddbe8910b253d803d754ef0a87c95b74ba3adc /doc
parent3a08499572250b46d061106298e2d2777276efc1 (diff)
parent5c3ae68299f79f3a705fa4b3e9cd262b56695318 (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 3b1abcebed..c80ccea8ac 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -411,9 +411,10 @@ Jonathan Yap
VWR-17801
VWR-24347
STORM-975
- STORM-990
+ STORM-1019
STORM-1020
STORM-1064
+ STORM-1077
Kage Pixel
VWR-11
Ken March
@@ -643,6 +644,7 @@ Robin Cornelius
SNOW-747
STORM-422
STORM-960
+ STORM-1019
VWR-2488
VWR-9557
VWR-10579