aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/doc
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-11-01 16:44:51 -0700
committerMcCabe Maxsted2010-11-01 16:44:51 -0700
commited6c99015bccfb196d75e59031b904bd8acfa387 (patch)
treeb3db9df5c75d7eea34636eb36ae69fa5466e994d /linden/doc
parentMerge remote branch 'jacek/weekly' into weekly (diff)
parentMerge branch 'weekly' of http://github.com/imprudence/imprudence into weekly (diff)
downloadmeta-impy-ed6c99015bccfb196d75e59031b904bd8acfa387.zip
meta-impy-ed6c99015bccfb196d75e59031b904bd8acfa387.tar.gz
meta-impy-ed6c99015bccfb196d75e59031b904bd8acfa387.tar.bz2
meta-impy-ed6c99015bccfb196d75e59031b904bd8acfa387.tar.xz
Merge remote branch 'aleric/weekly' into weekly
Diffstat (limited to 'linden/doc')
-rw-r--r--linden/doc/contributions.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index cd708fd..e5e3eb0 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -85,6 +85,8 @@ Aleric Inglewood
85 IMP-662 85 IMP-662
86 IMP-663 86 IMP-663
87 IMP-664 87 IMP-664
88 IMP-667
89 IMP-670
88Alissa Sabre 90Alissa Sabre
89 VWR-81 91 VWR-81
90 VWR-83 92 VWR-83