Mercurial > pidgin
changeset 20687:b1a42d258a14
explicit merge of '0b88f009442a340d4269c95605f580a9f444e767'
and 'cb13be33ceda2c587fec6fb3a86d8e777ca7194a'
to branch 'im.pidgin.pidgin'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Fri, 28 Sep 2007 17:01:20 +0000 |
| parents | fd664b4aa4f1 (current diff) 07c103ac3795 (diff) |
| children | 59043d445d1b |
| files | COPYRIGHT finch/gntconn.c finch/gntconv.c libpurple/protocols/jabber/buddy.c libpurple/protocols/jabber/jabber.c libpurple/protocols/jabber/message.c libpurple/protocols/msn/directconn.c libpurple/protocols/msn/msn-utils.c libpurple/protocols/msn/msn-utils.h libpurple/protocols/msn/servconn.c libpurple/protocols/myspace/markup.c libpurple/protocols/myspace/myspace.c libpurple/protocols/oscar/oscar.c libpurple/protocols/yahoo/yahoo.c libpurple/util.c libpurple/win32/win32dep.c pidgin/gtkblist.c pidgin/gtkcellrendererexpander.c pidgin/gtkconv.c pidgin/gtkimhtmltoolbar.c pidgin/gtkmain.c pidgin/gtknotify.c pidgin/gtkprefs.c |
| diffstat | 0 files changed, 0 insertions(+), 0 deletions(-) [+] |