summaryrefslogtreecommitdiff
path: root/doc/contributions.txt
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-17 10:18:03 -0400
committerOz Linden <oz@lindenlab.com>2011-03-17 10:18:03 -0400
commit458a063c7519b48fe3b90dd7e122317bf17d4fff (patch)
treeb001a3d71f514966693c2ef4faf919f21d291079 /doc/contributions.txt
parentabffd7aa4f81d77f4816e4134ba7eea2a5f66f58 (diff)
parent25b69823e6a29e21310ada2961dd4bbe08756f55 (diff)
Automated merge with file:///Users/oz/Work/V-PB
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 4c2a836b4c..560bedd518 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -412,6 +412,7 @@ Jonathan Yap
STORM-975
STORM-990
STORM-1020
+ STORM-1064
Kage Pixel
VWR-11
Ken March