summaryrefslogtreecommitdiff
path: root/doc/contributions.txt
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-10-17 16:19:57 -0400
committerOz Linden <oz@lindenlab.com>2011-10-17 16:19:57 -0400
commit77dc594e79118769087c0e2094c303fc5aaea5d4 (patch)
treeed538b0b4e1d0b1de7ecbf22f701bbb1595b967c /doc/contributions.txt
parent94c137d5c970bc01e3a4dbe8de6a7104085e5ba6 (diff)
parent1afbdc79c6fb911a5ab2c87067e7b99bec92fbc6 (diff)
merge back late changes and tags from release branch
Diffstat (limited to 'doc/contributions.txt')
-rw-r--r--doc/contributions.txt9
1 files changed, 4 insertions, 5 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index e85fc32f18..66b3237e63 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -65,16 +65,12 @@ Aimee Trescothick
Alejandro Rosenthal
VWR-1184
Aleric Inglewood
- SNOW-84
OPEN-38
SNOW-240
- SNOW-477
SNOW-522
SNOW-626
- SNOW-744
SNOW-756
SNOW-764
- SNOW-766
SNOW-800
VWR-10001
VWR-10579
@@ -100,8 +96,11 @@ Aleric Inglewood
VWR-24366
VWR-24519
VWR-24520
+ SNOW-84
+ SNOW-477
+ SNOW-744
+ SNOW-766
STORM-163
- STORM-864
STORM-955
STORM-960
Ales Beaumont