Mercurial > pidgin
diff libpurple/protocols/irc/irc.h @ 32802:fa666e7f747e
propagate from branch 'im.pidgin.pidgin.2.x.y' (head 55372aac7eca74e2a3121931b867702d2fdfe299)
to branch 'im.pidgin.pidgin' (head 1f233991b11d30d7bd9d1e058e19fe162a9600f3)
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Fri, 25 May 2012 19:41:04 +0000 |
parents | a78523019e7a 665388a0f573 |
children |
line wrap: on
line diff
--- a/libpurple/protocols/irc/irc.h Fri May 25 19:28:41 2012 +0000 +++ b/libpurple/protocols/irc/irc.h Fri May 25 19:41:04 2012 +0000 @@ -3,7 +3,7 @@ * * purple * - * Copyright (C) 2003, Ethan Blanton <eblanton@cs.purdue.edu> + * Copyright (C) 2003, 2012 Ethan Blanton <elb@pidgin.im> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -56,7 +56,6 @@ int fd; guint inpa; guint timer; - guint who_channel_timer; GHashTable *buddies; gboolean ison_outstanding;