summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorIma Mechanique <ima.mechanique@secondlife.com>2014-02-01 13:07:42 +0000
committerIma Mechanique <ima.mechanique@secondlife.com>2014-02-01 13:07:42 +0000
commitd993d6347a2c9f559d9ee8c5ac8e9292944156f0 (patch)
tree02149e36b1cdbf7016a94af5e55a010b1eaa7bd9 /doc
parentcec62b7872db7a9ca52e3872b96bf36f6e271f77 (diff)
parent69c32b04cfd52c6fbd34997fa6485a84435743ef (diff)
Merge
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt14
1 files changed, 9 insertions, 5 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 2f9d0c2c86..c77e408e79 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -309,7 +309,7 @@ Cinder Roxley
BUG-2326
OPEN-185
STORM-1703
- STORM-1948
+ STORM-1948
STORM-1888
STORM-1958
STORM-1952
@@ -515,8 +515,16 @@ Ima Mechanique
STORM-959
STORM-1175
STORM-1708
+ STORM-1831
+ STORM-1832
STORM-1855
+ VWR-10791
VWR-20553
+ VWR-19213
+ VWR-22401
+ VWR-23739
+ VWR-24766
+ VWR-28065
Imnotgoing Sideways
Inma Rau
Innula Zenovka
@@ -1397,7 +1405,3 @@ Zipherius Turas
VWR-77
Zoex Flanagan
-
-
-
-