1 files changed, 10 insertions, 8 deletions
diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt
index c48ede5..a369a75 100644
--- a/CONTRIBUTORS.txt
+++ b/CONTRIBUTORS.txt
@@ -13,7 +13,7 @@ people that make the day to day of OpenSim happen.
 * lbsa71 (Tribal Media AB)
 * Sean Dague / sdague (IBM)
 * Tedd
-* justincc (Black Dress Technology)
+* justincc
 * Teravus (w3z)
 * Johan Berntsson (3Di)
 * Ckrinke (Charles Krinke)
@@ -29,6 +29,7 @@ people that make the day to day of OpenSim happen.
 * nlin (3Di)
 * Arthur Rodrigo S Valadares (IBM)
 = Past Open Sim Developers =
 These folks are alumns of the OpenSim core group, but are now
 currently not active.  Their great contributions helped get us to
@@ -44,6 +45,7 @@ where we are today.
 * Darok
 * Alondria
 = Additional OpenSim Contributors =
 These folks have contributed code patches to OpenSim to help make it
 what it is today.  
@@ -90,6 +92,7 @@ what it is today.
 * maimedleech
 * Mic Bowman
 * Michelle Argus
+* Michael Cortez (The Flotsam Project, http://osflotsam.org/)
 * Mike Osias (IBM)
 * Mike Pitman (IBM)
 * mikkopa/_someone - RealXtend
@@ -123,8 +126,7 @@ what it is today.
 * Zha Ewry
+= LSL Devs =
-LSL Devs
 * Alondria
 * CharlieO
@@ -132,7 +134,7 @@ LSL Devs
 * Melanie Thielker
-Testers
+= Testers =
 * Ai Austin
 * CharlieO (LSL)
@@ -140,10 +142,6 @@ Testers
 * openlifegrid.com
-AssetInventory Server and some plugins are based on Cable Beach
-Cable Beach is Copyright (c) 2008 Intel Corporation
-see http://forge.opensimulator.org/gf/project/assetserver/
 This software uses components from the following developers:
 * Sleepycat Software (Berkeley DB)
 * SQLite (Public Domain)
@@ -161,6 +159,10 @@ This software uses components from the following developers:
 * log4net (http://logging.apache.org/log4net/)
 * GlynnTucker.Cache (http://gtcache.sourceforge.net/)
+Some plugins are based on Cable Beach
+Cable Beach is Copyright (c) 2008 Intel Corporation
+see http://forge.opensimulator.org/gf/project/assetserver/
 In addition, we would like to thank:
 * The Mono Project
 * The NANT Developers

diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index c48ede5..a369a75 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt
@@ -13,7 +13,7 @@ people that make the day to day of OpenSim happen.
13	* lbsa71 (Tribal Media AB)	13	* lbsa71 (Tribal Media AB)
14	* Sean Dague / sdague (IBM)	14	* Sean Dague / sdague (IBM)
15	* Tedd	15	* Tedd
16	* justincc (Black Dress Technology)	16	* justincc
17	* Teravus (w3z)	17	* Teravus (w3z)
18	* Johan Berntsson (3Di)	18	* Johan Berntsson (3Di)
19	* Ckrinke (Charles Krinke)	19	* Ckrinke (Charles Krinke)
@@ -29,6 +29,7 @@ people that make the day to day of OpenSim happen.
29	* nlin (3Di)	29	* nlin (3Di)
30	* Arthur Rodrigo S Valadares (IBM)	30	* Arthur Rodrigo S Valadares (IBM)
31		31
		32
32	= Past Open Sim Developers =	33	= Past Open Sim Developers =
33	These folks are alumns of the OpenSim core group, but are now	34	These folks are alumns of the OpenSim core group, but are now
34	currently not active. Their great contributions helped get us to	35	currently not active. Their great contributions helped get us to
@@ -44,6 +45,7 @@ where we are today.
44	* Darok	45	* Darok
45	* Alondria	46	* Alondria
46		47
		48
47	= Additional OpenSim Contributors =	49	= Additional OpenSim Contributors =
48	These folks have contributed code patches to OpenSim to help make it	50	These folks have contributed code patches to OpenSim to help make it
49	what it is today.	51	what it is today.
@@ -90,6 +92,7 @@ what it is today.
90	* maimedleech	92	* maimedleech
91	* Mic Bowman	93	* Mic Bowman
92	* Michelle Argus	94	* Michelle Argus
		95	* Michael Cortez (The Flotsam Project, http://osflotsam.org/)
93	* Mike Osias (IBM)	96	* Mike Osias (IBM)
94	* Mike Pitman (IBM)	97	* Mike Pitman (IBM)
95	* mikkopa/_someone - RealXtend	98	* mikkopa/_someone - RealXtend
@@ -123,8 +126,7 @@ what it is today.
123	* Zha Ewry	126	* Zha Ewry
124		127
125		128
126		129	= LSL Devs =
127	LSL Devs
128		130
129	* Alondria	131	* Alondria
130	* CharlieO	132	* CharlieO
@@ -132,7 +134,7 @@ LSL Devs
132	* Melanie Thielker	134	* Melanie Thielker
133		135
134		136
135	Testers	137	= Testers =
136		138
137	* Ai Austin	139	* Ai Austin
138	* CharlieO (LSL)	140	* CharlieO (LSL)
@@ -140,10 +142,6 @@ Testers
140	* openlifegrid.com	142	* openlifegrid.com
141		143
142		144
143	AssetInventory Server and some plugins are based on Cable Beach
144	Cable Beach is Copyright (c) 2008 Intel Corporation
145	see http://forge.opensimulator.org/gf/project/assetserver/
146
147	This software uses components from the following developers:	145	This software uses components from the following developers:
148	* Sleepycat Software (Berkeley DB)	146	* Sleepycat Software (Berkeley DB)
149	* SQLite (Public Domain)	147	* SQLite (Public Domain)
@@ -161,6 +159,10 @@ This software uses components from the following developers:
161	* log4net (http://logging.apache.org/log4net/)	159	* log4net (http://logging.apache.org/log4net/)
162	* GlynnTucker.Cache (http://gtcache.sourceforge.net/)	160	* GlynnTucker.Cache (http://gtcache.sourceforge.net/)
163		161
		162	Some plugins are based on Cable Beach
		163	Cable Beach is Copyright (c) 2008 Intel Corporation
		164	see http://forge.opensimulator.org/gf/project/assetserver/
		165
164	In addition, we would like to thank:	166	In addition, we would like to thank:
165	* The Mono Project	167	* The Mono Project
166	* The NANT Developers	168	* The NANT Developers