summaryrefslogtreecommitdiff
path: root/doc/contributions.txt
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-03-21 10:38:39 -0400
committerLoren Shih <seraph@lindenlab.com>2011-03-21 10:38:39 -0400
commitbe553242ef706e33260f3f9e62d02f4720f00473 (patch)
tree553a150a63cd8105f8860780ef7d02f12a69eb23 /doc/contributions.txt
parent9c1c791b29cb5087ebff142d4ad7a55b65be0ad0 (diff)
parentdf63c6931e81c034887611711095e3134b9a7318 (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to 'doc/contributions.txt')
-rw-r--r--doc/contributions.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 337a3da6b8..3b1abcebed 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -413,6 +413,7 @@ Jonathan Yap
STORM-975
STORM-990
STORM-1020
+ STORM-1064
Kage Pixel
VWR-11
Ken March