From 4f81ce3e43058ba71ff48e5f692cf0e48587b273 Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Fri, 8 Oct 2010 22:43:56 +0200
Subject: IMP-429: Link against prebuilt libraries / always use gtk-related
 system libs (linux)

(cherry picked from commit a3cffd06a0e7aa92e1b6c28e7bad655b7085296c)
---
 linden/doc/contributions.txt | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'linden/doc')

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index a1e46fd..57745e2 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -46,6 +46,25 @@ Aleric Inglewood
 	VWR-10759
 	VWR-10837
 	IMP-581
+	SNOW-800
+	RED-429
+	RED-552
+	RED-553
+	RED-554
+	RED-556
+	RED-560
+	RED-561
+	RED-562
+	RED-565
+	RED-566
+	RED-567
+	RED-573
+	RED-575
+	RED-576
+	RED-577
+	RED-578
+	RED-579
+	RED-581
 Alissa Sabre
 	VWR-81
 	VWR-83
@@ -87,11 +106,8 @@ Alissa Sabre
         VWR-7087
         VWR-7153
         VWR-7168
-<<<<<<< HEAD
-=======
         VWR-7087
         VWR-7086
->>>>>>> origin/next
 	VWR-9190
 	VWR-10728
 	VWR-12620
-- 
cgit v1.1