summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-05-15 17:23:51 -0400
committerOz Linden <oz@lindenlab.com>2013-05-15 17:23:51 -0400
commit387732090b7464763f6b5788a50545db243ac4be (patch)
tree1023f4c5513a0cab5f5c343e653f2bf7c4c96d68 /doc
parentad09e2111cd980117ae937b79155ef6c24e4567c (diff)
parent83608fedb76a346f0f69e1c73769723c4069d9fd (diff)
merge up to latest integration repo
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 26fbfe2bb0..5c445e9ed0 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1023,6 +1023,7 @@ Ryozu Kojima
VWR-287
Sachi Vixen
Sahkolihaa Contepomi
+ MATBUG-102
Saii Hallard
SaintLEOlions Zimer
Salahzar Stenvaag