Merge branch 'weekly' into webkit_plugins

Conflicts: linden/doc/contributions.txt Renamed RED --> IMP. Merged entries from both.
author: Aleric Inglewood 2010-10-24 00:16:45 +0200
committer: Aleric Inglewood 2010-10-24 00:16:45 +0200
commit: df41e471c1e7eca1dd50ad7e752f41c391c518c2 (patch)
tree: 945b797af6fa9e96a914f315b09c97ce49caadec /linden/doc
parent: Merge branch 'weekly' into webkit_plugins (diff)
parent: IMP-664: WARNING: addFeature: LLFeatureList::Attempting to add preexisting fe... (diff)
download: meta-impy-df41e471c1e7eca1dd50ad7e752f41c391c518c2.zip
meta-impy-df41e471c1e7eca1dd50ad7e752f41c391c518c2.tar.gz
meta-impy-df41e471c1e7eca1dd50ad7e752f41c391c518c2.tar.bz2
meta-impy-df41e471c1e7eca1dd50ad7e752f41c391c518c2.tar.xz
1 files changed, 25 insertions, 20 deletions
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 4d3f017..f4cc66f 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -62,25 +62,30 @@ Aleric Inglewood
        SNOW-766
        SNOW-796
        SNOW-800
-        RED-429
+        IMP-429
-        RED-552
+        IMP-552
-        RED-553
+        IMP-553
-        RED-554
+        IMP-554
-        RED-556
+        IMP-556
-        RED-560
+        IMP-560
-        RED-561
+        IMP-561
-        RED-562
+        IMP-562
-        RED-565
+        IMP-565
-        RED-566
+        IMP-566
-        RED-567
+        IMP-567
-        RED-573
+        IMP-573
-        RED-575
+        IMP-575
-        RED-576
+        IMP-576
-        RED-577
+        IMP-577
-        RED-578
+        IMP-578
-        RED-579
+        IMP-579
-        RED-581
+        IMP-581
-        RED-595
+        IMP-595
+        IMP-660
+        IMP-661
+        IMP-662
+        IMP-663
+        IMP-664
 Alissa Sabre
        VWR-81
        VWR-83
@@ -513,7 +518,7 @@ Robin Cornelius
        VWR-2488
        VWR-9557
        VWR-12838
-        RED-595
+        IMP-595
 Ryozu Kojima
        VWR-53
        VWR-287
author	Aleric Inglewood	2010-10-24 00:16:45 +0200
committer	Aleric Inglewood	2010-10-24 00:16:45 +0200
commit	df41e471c1e7eca1dd50ad7e752f41c391c518c2 (patch)
tree	945b797af6fa9e96a914f315b09c97ce49caadec /linden/doc
parent	Merge branch 'weekly' into webkit_plugins (diff)
parent	IMP-664: WARNING: addFeature: LLFeatureList::Attempting to add preexisting fe... (diff)
download	meta-impy-df41e471c1e7eca1dd50ad7e752f41c391c518c2.zip meta-impy-df41e471c1e7eca1dd50ad7e752f41c391c518c2.tar.gz meta-impy-df41e471c1e7eca1dd50ad7e752f41c391c518c2.tar.bz2 meta-impy-df41e471c1e7eca1dd50ad7e752f41c391c518c2.tar.xz

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt index 4d3f017..f4cc66f 100644 --- a/linden/doc/contributions.txt +++ b/linden/doc/contributions.txt
@@ -62,25 +62,30 @@ Aleric Inglewood
62	SNOW-766	62	SNOW-766
63	SNOW-796	63	SNOW-796
64	SNOW-800	64	SNOW-800
65	RED-429	65	IMP-429
66	RED-552	66	IMP-552
67	RED-553	67	IMP-553
68	RED-554	68	IMP-554
69	RED-556	69	IMP-556
70	RED-560	70	IMP-560
71	RED-561	71	IMP-561
72	RED-562	72	IMP-562
73	RED-565	73	IMP-565
74	RED-566	74	IMP-566
75	RED-567	75	IMP-567
76	RED-573	76	IMP-573
77	RED-575	77	IMP-575
78	RED-576	78	IMP-576
79	RED-577	79	IMP-577
80	RED-578	80	IMP-578
81	RED-579	81	IMP-579
82	RED-581	82	IMP-581
83	RED-595	83	IMP-595
		84	IMP-660
		85	IMP-661
		86	IMP-662
		87	IMP-663
		88	IMP-664
84	Alissa Sabre	89	Alissa Sabre
85	VWR-81	90	VWR-81
86	VWR-83	91	VWR-83
@@ -513,7 +518,7 @@ Robin Cornelius
513	VWR-2488	518	VWR-2488
514	VWR-9557	519	VWR-9557
515	VWR-12838	520	VWR-12838
516	RED-595	521	IMP-595
517	Ryozu Kojima	522	Ryozu Kojima
518	VWR-53	523	VWR-53
519	VWR-287	524	VWR-287