From 130b5a4d116eca32d5b949c6dca924b6e9886e47 Mon Sep 17 00:00:00 2001
From: theoddone33 <>
Date: Sun, 7 Jul 2002 03:12:02 +0000
Subject: [PATCH] Unify authors files and change ui.asm so we don't have
 battles over credits

---
 zsnes/authors.txt   | 28 ++++++++++++++++++++++++++--
 zsnes/linux/AUTHORS | 13 -------------
 zsnes/src/ui.asm    |  3 +--
 3 files changed, 27 insertions(+), 17 deletions(-)
 delete mode 100644 zsnes/linux/AUTHORS

diff --git a/zsnes/authors.txt b/zsnes/authors.txt
index ca8896dc..6cff4b13 100644
--- a/zsnes/authors.txt
+++ b/zsnes/authors.txt
@@ -1,6 +1,30 @@
-ZSNES Open Source Authors:
---------------------------
+--------------
+The ZSNES Team
+--------------
 
 zsKnight <zsknight@zsnes.com>
 _Demo_ <z_demo_z@users.sourceforge.net>
+pagefault
 
+------------------
+Additional Authors
+------------------
+
+stainless
+pharos
+teuf
+relnev
+prometheus
+theoddone33
+EvilTypeGuy
+hpsolo
+aaronl
+Diablo-D3
+
+-------------
+Miscellaneous
+-------------
+
+Wilbern Cobb - initial OpenBSD work
+Thorsten "mirabile" Glaser - more OpenBSD integration
+Mitchell "The Khan Artist" Mebane - manpage
diff --git a/zsnes/linux/AUTHORS b/zsnes/linux/AUTHORS
deleted file mode 100644
index b24566ff..00000000
--- a/zsnes/linux/AUTHORS
+++ /dev/null
@@ -1,13 +0,0 @@
-Coding:
-	Christophe "teuf" Fergeau
-	Steven "relnev" Fuller
-	Andrew "prometheus" Henderson
-	Dan "theoddone33" Olson
-	Shawn "EvilTypeGuy" Walker
-	Han "hpsolo" Duong
-	Aaron Lehmann
-	Patrick "Diablo-D3" McFarland
-Miscellanious Contributions:
-	Wilbern Cobb - initial OpenBSD work
-	Thorsten "mirabile" Glaser - more OpenBSD integration
-	Mitchell "The Khan Artist" Mebane - manpage
diff --git a/zsnes/src/ui.asm b/zsnes/src/ui.asm
index b61bdee6..4902bf86 100644
--- a/zsnes/src/ui.asm
+++ b/zsnes/src/ui.asm
@@ -143,8 +143,7 @@ NEWSYM welcome
                  db 'ZSNES v',ZVERSION,' (c) 1997-2002, ZSNES Team (zsKnight & _Demo_)',13,10,13,10
                  db 'Be sure to check http://www.zsnes.com/ for the latest version.',13,10
                  db 'Please report crashes to zsnes-devel@lists.sourceforge.net.',13,10,13,10
-                 db '  Main Coders      : zsKnight, _Demo_, and pagefault',13,10
-                 db '  Assistant Coders : Pharos, teuf, theoddone33, and stainless',13,10,13,10
+                 db 'ZSNES is written by the ZSNES Team (See AUTHORS.TXT)',13,10
                  db 'ZSNES comes with ABSOLUTELY NO WARRANTY.  This is free software,',10,13
                  db 'and you are welcome to redistribute it under certain conditions;',10,13
 %ifdef __LINUX__