Mercurial > pidgin
changeset 20685:02df6998b466
propagate from branch 'im.pidgin.rlaager.merging.2_2_1_conflicts' (head 4ad1081695d083df424898e6e7091f731b401265)
to branch 'im.pidgin.pidgin' (head d33243e8f5347776c81f81a0e4ba3a76ae5505a5)
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 28 Sep 2007 16:34:43 +0000 |
parents | 509ca8ebe515 (diff) 8d9db4584f02 (current diff) |
children | fd664b4aa4f1 |
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/msn/userlist.c libpurple/protocols/myspace/markup.c libpurple/protocols/myspace/myspace.c libpurple/protocols/oscar/oscar.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(-) [+] |