aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/doc
diff options
context:
space:
mode:
authorAleric Inglewood2010-10-25 17:52:49 +0200
committerAleric Inglewood2010-10-25 17:52:49 +0200
commit48a30bf6d2bc6eecad1148cc8c465c57a60947cf (patch)
tree4dadc70b4ee6d945cc47d8dba13339232f4e1b2e /linden/doc
parentMerge branch 'weekly' into webkit_plugins (diff)
parentIMP-667: WARNING: remove: Attempting to remove filename: /ramdisk/imprudence/... (diff)
downloadmeta-impy-48a30bf6d2bc6eecad1148cc8c465c57a60947cf.zip
meta-impy-48a30bf6d2bc6eecad1148cc8c465c57a60947cf.tar.gz
meta-impy-48a30bf6d2bc6eecad1148cc8c465c57a60947cf.tar.bz2
meta-impy-48a30bf6d2bc6eecad1148cc8c465c57a60947cf.tar.xz
Merge branch 'weekly' into webkit_plugins
Diffstat (limited to '')
-rw-r--r--linden/doc/contributions.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index f4cc66f..89ab538 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -86,6 +86,7 @@ Aleric Inglewood
86 IMP-662 86 IMP-662
87 IMP-663 87 IMP-663
88 IMP-664 88 IMP-664
89 IMP-667
89Alissa Sabre 90Alissa Sabre
90 VWR-81 91 VWR-81
91 VWR-83 92 VWR-83