summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGraham Madarasz <graham@lindenlab.com>2013-05-11 20:38:23 -0700
committerGraham Madarasz <graham@lindenlab.com>2013-05-11 20:38:23 -0700
commite1c1428569b03bbb20e7597ebec7d707151ce802 (patch)
tree69ca6d0fd05300346ddc14664b6d44bd4206a8b4 /doc
parentf356d7eb9fd730f5f6f5a29fb0706e20876ad3bd (diff)
parentab4104d2d785199722f93d027e72af40d16f5703 (diff)
Merge viewer-dev-materials and bugfix in LLPanelFace::getState using material instead of mMaterial
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/contributions.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 33cf0a422e..26fbfe2bb0 100755
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -1070,10 +1070,12 @@ Sheet Spotter
Shnurui Troughton
Shyotl Kuhr
MAINT-1138
+ MAINT-2334
Siana Gearz
STORM-960
STORM-1088
MAINT-1138
+ MAINT-2334
sicarius Thorne
Sicarius Toxx
SignpostMarv Martin
@@ -1091,6 +1093,8 @@ SLB Wirefly
Slee Mayo
SEC-1075
snowy Sidran
+Sovereign Engineer
+ MAINT-2334
SpacedOut Frye
VWR-34
VWR-45
@@ -1345,3 +1349,4 @@ Zoex Flanagan
+