From 01eb46492e4eb8df58db6919b0ab6789263a2d4c Mon Sep 17 00:00:00 2001
From: Aleric Inglewood
Date: Tue, 28 Sep 2010 02:51:12 +0200
Subject: RED-566: doc/contributions.txt clean up

See http://redmine.imprudenceviewer.org/issues/566
Removed collision markers, and fixed white space issues
(every line in doc/contributions.txt should start with a TAB).
Also added a few SNOW acknowledgements that were missing (that
are already in the imprudence code but not acknowledged in
doc/contributions.txt). I didn't check everything of course,
only my own SNOW contributions related to the build system.
---
 linden/doc/contributions.txt | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

(limited to 'linden')

diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index c3d5e59..db58a72 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -40,10 +40,12 @@ Aimee Trescothick
 Alejandro Rosenthal
 	VWR-1184
 Aleric Inglewood
-	SNOW-196
-	SNOW-408
 	VWR-10759
 	VWR-10837
+	SNOW-196
+	SNOW-240
+	SNOW-408
+	SNOW-479
 Alissa Sabre
 	VWR-81
 	VWR-83
@@ -65,34 +67,29 @@ Alissa Sabre
 	VWR-1351
 	VWR-1353
 	VWR-1410
-        VWR-1843
+	VWR-1843
 	VWR-2116
 	VWR-2826
 	VWR-3290
 	VWR-3410
-	SNOW-408
 	VWR-3857
 	VWR-4010
 	VWR-5575
-        VWR-5929
-        VWR-6384
-        VWR-6385
+	VWR-5929
+	VWR-6384
+	VWR-6385
 	VWR-6386
-        VWR-6430
+	VWR-6430
 	VWR-6858
-        VWR-6668
-        VWR-7086
-        VWR-7087
-        VWR-7153
-        VWR-7168
-<<<<<<< HEAD
-=======
-        VWR-7087
-        VWR-7086
->>>>>>> origin/next
+	VWR-6668
+	VWR-7086
+	VWR-7087
+	VWR-7153
+	VWR-7168
 	VWR-9190
 	VWR-10728
 	VWR-12620
+	SNOW-408
 Angus Boyd
 	VWR-592
 Ann Congrejo
-- 
cgit v1.1