summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2011-07-08 18:26:08 -0700
committerDon Kjer <don@lindenlab.com>2011-07-08 18:26:08 -0700
commite63dd834ab84d740b242686d6e5315f7b47d03da (patch)
tree826c36a664dc609dc49c203d760b44f5abe8f514 /doc
parentb9d6b5ef9a9797709397be983ec74c30cd1e0ce2 (diff)
parent187bc5211437718016a22e60c7b5ed29823c8510 (diff)
Merge viewer-development -> mesh-development
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 67e78e87ee..7a3d2a2485 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -460,6 +460,7 @@ Jonathan Yap
STORM-1392
STORM-1302
STORM-1326
+ STORM-1462
Kage Pixel
VWR-11
Ken March