summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS12
-rw-r--r--README2
-rw-r--r--doc/CREDITS2
-rw-r--r--doc/gaim.14
-rw-r--r--src/about.c4
5 files changed, 12 insertions, 12 deletions
diff --git a/AUTHORS b/AUTHORS
index ec2cede42e..4cf4b15ed1 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -9,17 +9,17 @@ Rob Flynn <rob@marko.net> - Main developer (send patches here)
MSN: rmf410@hotmail.com
Yahoo: IBRRob
Jabber: robflynn@jabber.org
-Eric Warmenhoven <warmenhoven@yahoo.com> - Second in Command (patches here too)
- AIM: EWarmenhoven
- ICQ: 22994591
- MSN: warmenhoven@hotmail.com
- Yahoo: warmenhoven
- Jabber: warmenhoven@jabber.org
Syd Logan - Hacker and Designated Driver (lazy bum)
+Sean Egan
+Decklin Foster
+Ben Miller
+Nathan Walp
+
We've got an IRC room now too, #gaim on irc.openprojects.net. Come check us out.
Retired:
--------
Jim Duchek <jimduchek@ou.edu> - Former Maintainer
Mark Spencer <markster@marko.net> - Original Author
+Eric Warmenhoven <warmenhoven@yahoo.com>
diff --git a/README b/README
index 48fc14f128..f83ecb7674 100644
--- a/README
+++ b/README
@@ -1,9 +1,9 @@
gaim
========================
Rob Flynn <rob@marko.net> IM: RobFlynn (currnet maintainer)
-Eric Warmenhoven <warmenhoven@yahoo.com> IM: EWarmenhoven (lead devel)
Syd Logan - Super Hacker and Resident Designated Driver
Jim Duchek <jimduchek@ou.edu> IM: Zilding (former maintainer)
+Eric Warmenhoven <warmenhoven@yahoo.com> (retired)
Mark Spencer <markster@marko.net>
Gaim is an IM client that supports many protocols, including AIM, ICQ,
diff --git a/doc/CREDITS b/doc/CREDITS
index 3b025ca607..0ada2a335a 100644
--- a/doc/CREDITS
+++ b/doc/CREDITS
@@ -5,9 +5,9 @@ CREDITS
Authors:
Rob Flynn <IM: RobFlynn> rflynn@blueridge.net
-Eric Warmenhoven <IM: EWarmenhoven> warmenhoven@yahoo.com
Syd Logan
Jim Duchek <IM: zilding> jimduchek@ou.edu
+Eric Warmenhoven warmenhoven@yahoo.com
Mark Spencer <IM: markster97> markster@marko.net
Other Contributors:
diff --git a/doc/gaim.1 b/doc/gaim.1
index 6efddf1b65..18279305a4 100644
--- a/doc/gaim.1
+++ b/doc/gaim.1
@@ -367,14 +367,14 @@ The authors of \fBgaim\fR are:
.PP
Rob Flynn <rob@marko.net> \- AIM: RobFlynn
.br
- Eric Warmenhoven <warmenhoven@yahoo.com> \- AIM: EWarmenhoven
-.br
Syd Logan
The retired authors of \fBgaim\fR are:
.PP
Jim Duchek <jim@linuxpimps.com> \- AIM: Zilding
.br
+ Eric Warmenhoven <warmenhoven@yahoo.com>
+.br
Mark Spencer <markster@marko.net> \- AIM: Markster97
diff --git a/src/about.c b/src/about.c
index fcca9cc2c2..b1ce1d0932 100644
--- a/src/about.c
+++ b/src/about.c
@@ -132,8 +132,8 @@ void show_about(GtkWidget *w, void *null)
text = gtk_text_new(NULL, NULL);
gtk_text_insert(GTK_TEXT(text), NULL, NULL, NULL,
- _("Rob Flynn (maintainer) rob@marko.net\nEric Warmenhoven (lead coder) warmenhoven@yahoo.com\n\nBenjamin Miller\nDecklin Foster\nSean Egan\nJim Duchek\nMark Spencer (original author) markster@marko.net"),
- 208);
+ _("Rob Flynn (maintainer) rob@marko.net\nEric Warmenhoven warmenhoven@yahoo.com\n\nBenjamin Miller\nDecklin Foster\nSean Egan\nJim Duchek\nMark Spencer (original author) markster@marko.net"),
+ 194);
gtk_box_pack_start(GTK_BOX(fbox), text, TRUE, TRUE, 0);
gtk_widget_show(text);