From 35df5441d3e2789663532c948731aff3a1e04728 Mon Sep 17 00:00:00 2001
From: Armin Weatherwax
Date: Mon, 14 Jun 2010 12:04:49 +0200
Subject: llmediaplugins first step

---
 linden/doc/LICENSE-logos.txt | 23 +++++++++++++++++++++++
 linden/doc/contributions.txt |  7 ++-----
 2 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 linden/doc/LICENSE-logos.txt

(limited to 'linden/doc')

diff --git a/linden/doc/LICENSE-logos.txt b/linden/doc/LICENSE-logos.txt
new file mode 100644
index 0000000..e63c48e
--- /dev/null
+++ b/linden/doc/LICENSE-logos.txt
@@ -0,0 +1,23 @@
+COPYRIGHT AND PERMISSION NOTICE
+
+Second Life(TM) Viewer Artwork.  Copyright (C) 2008 Linden Research, Inc.
+
+Linden Research, Inc. ("Linden Lab") licenses the Second Life viewer
+artwork and other works in the files distributed with this Notice under
+the Creative Commons Attribution-Share Alike 3.0 License, available at 
+http://creativecommons.org/licenses/by-sa/3.0/legalcode.  For the license
+summary, see http://creativecommons.org/licenses/by-sa/3.0/.
+
+Notwithstanding the foregoing, all of Linden Lab's trademarks, including
+but not limited to the Second Life brand name and Second Life Eye-in-Hand
+logo, are subject to our trademark policy at
+http://secondlife.com/corporate/trademark/.
+
+If you distribute any copies or adaptations of the Second Life viewer
+artwork or any other works in these files, you must include this Notice
+and clearly identify any changes made to the original works.  Include
+this Notice and information where copyright notices are usually included,
+for example, after your own copyright notice acknowledging your use of
+the Second Life viewer artwork, in a text file distributed with your
+program, in your application's About window, or on a credits page for
+your work.
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index c3d5e59..329fc28 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -85,11 +85,6 @@ Alissa Sabre
         VWR-7087
         VWR-7153
         VWR-7168
-<<<<<<< HEAD
-=======
-        VWR-7087
-        VWR-7086
->>>>>>> origin/next
 	VWR-9190
 	VWR-10728
 	VWR-12620
@@ -558,6 +553,8 @@ TBBle Kurosawa
 	VWR-1892
 Teardrops Fall
 	VWR-5366
+Techwolf Lupindo
+	SNOW-334
 tenebrous pau
 	VWR-247
 Tharax Ferraris
-- 
cgit v1.1


From 67f55bad571044535f1d8c3b3c3afb5078249fd3 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Fri, 15 Oct 2010 17:49:06 +0200
Subject: RED-595: Manual merge with weekly-webkit.

Plus some white space fixes (TABs --> spaces) in install.xml.
---
 linden/doc/contributions.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'linden/doc')

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index 931794c..4d3f017 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -80,6 +80,7 @@ Aleric Inglewood
 	RED-578
 	RED-579
 	RED-581
+	RED-595
 Alissa Sabre
 	VWR-81
 	VWR-83
@@ -512,6 +513,7 @@ Robin Cornelius
 	VWR-2488
 	VWR-9557
 	VWR-12838
+	RED-595
 Ryozu Kojima
 	VWR-53
 	VWR-287
-- 
cgit v1.1