summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorBrad Kittenbrink <brad@lindenlab.com>2008-02-27 18:58:14 +0000
committerBrad Kittenbrink <brad@lindenlab.com>2008-02-27 18:58:14 +0000
commit6d52efe452aa8469e0343da1c7d108f3f52ab651 (patch)
treea87be48e9840d7fc1f7ee514d7c7f994e71fdb3c /doc
parent6027ad2630b8650cabcf00628ee9b0d25bedd67f (diff)
Merge of windlight into release (QAR-286). This includes all changes in
windlight14 which have passed QA (up through r79932). svn merge -r 80831:80833 svn+ssh://svn.lindenlab.com/svn/linden/branches/merge_windlight14_r80620
Diffstat (limited to 'doc')
-rw-r--r--doc/contributions.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index e3f12fe439..c57a2792d9 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -8,6 +8,9 @@ Able Whitman
VWR-650
VWR-1460
VWR-1691
+Aimee Trescothick
+ VWR-3903
+ VWR-4803
Alejandro Rosenthal
VWR-1184
Alissa Sabre
@@ -44,9 +47,12 @@ Balp Allen
Benja Kepler
VWR-746
Blakar Ogre
+ VWR-418
VWR-881
+ VWR-983
VWR-1612
VWR-1613
+ VWR-2164
blino Nakamura
VWR-17
Boroondas Gupte
@@ -172,6 +178,7 @@ McCabe Maxsted
Michelle2 Zenovka
VWR-2652
VWR-2834
+ VWR-3749
Mm Alder
VWR-3777
Mr Greggan