# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1179865576 0
# Node ID 94fe470d4c9a00f81079f724fb531098d7f0e904
# Parent  1927f4ead3ca917c11ec60525a7637d12e86c6a1# Parent  2b82b01e016a8e64789faf94b20e3e7b633a26ce
merge of '09aca500377f9423b7231bd192a1f472770099c0'
     and '651b5732c29ee328aa94bfc38f63dbe8738bfdf4'

diff -r 1927f4ead3ca -r 94fe470d4c9a AUTHORS
--- a/AUTHORS	Tue May 22 18:56:09 2007 +0000
+++ b/AUTHORS	Tue May 22 20:26:16 2007 +0000
@@ -3,8 +3,7 @@
 
 For a complete list of all contributors, see the COPYRIGHT file.
 
-We've got an IRC room now too, #pidgin on irc.freenode.net
-(#pidgin-win32 for Windows users). Come check us out.
+We've got an IRC room now too, #pidgin on irc.freenode.net. Come check us out.
 
 Current Developers:
 ------------------
diff -r 1927f4ead3ca -r 94fe470d4c9a pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Tue May 22 18:56:09 2007 +0000
+++ b/pidgin/gtkdialogs.c	Tue May 22 20:26:16 2007 +0000
@@ -378,13 +378,8 @@
 
 	g_string_append(str, "<FONT SIZE=\"4\">URL:</FONT> <A HREF=\""
 					PURPLE_WEBSITE "\">" PURPLE_WEBSITE "</A><BR/><BR/>");
-#ifdef _WIN32
-	g_string_append_printf(str, _("<FONT SIZE=\"4\">IRC:</FONT> "
-						   "#pidgin-win32 on irc.freenode.net<BR><BR>"));
-#else
 	g_string_append_printf(str, _("<FONT SIZE=\"4\">IRC:</FONT> "
 						   "#pidgin on irc.freenode.net<BR><BR>"));
-#endif
 
 	/* Current Developers */
 	g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>",