pidgin3: changeset 20749:63dc3fdc121b

changeset
raw

changeset

explicit merge of '99e23c8bc2b14ac7facd9d548f02beeda582ac68'

Fri, 28 Sep 2007 17:01:20 +0000

author: Richard Laager <rlaager@pidgin.im>
date: Fri, 28 Sep 2007 17:01:20 +0000
changeset 20749: 63dc3fdc121b
parent 20748: 99e23c8bc2b1 (current diff)
parent 20151: 0b5ba1105191 (diff)
child 20750: b90234774159

explicit merge of '99e23c8bc2b14ac7facd9d548f02beeda582ac68'
and '0b5ba11051910f17e8b567677bf532ebe167a8cc'
to branch 'im.pidgin.pidgin'

COPYRIGHT		file \| annotate \| diff \| comparison \| revisions
finch/gntconn.c		file \| annotate \| diff \| comparison \| revisions
finch/gntconv.c		file \| annotate \| diff \| comparison \| revisions
libpurple/protocols/jabber/buddy.c		file \| annotate \| diff \| comparison \| revisions
libpurple/protocols/jabber/jabber.c		file \| annotate \| diff \| comparison \| revisions
libpurple/protocols/jabber/message.c		file \| annotate \| diff \| comparison \| revisions
libpurple/protocols/msn/directconn.c		file \| annotate \| diff \| comparison \| revisions
libpurple/protocols/msn/msn-utils.c		file \| annotate \| diff \| comparison \| revisions
libpurple/protocols/msn/msn-utils.h		file \| annotate \| diff \| comparison \| revisions
libpurple/protocols/msn/msnutils.c		file \| annotate \| diff \| comparison \| revisions
libpurple/protocols/msn/msnutils.h		file \| annotate \| diff \| comparison \| revisions
libpurple/protocols/msn/servconn.c		file \| annotate \| diff \| comparison \| revisions
libpurple/protocols/myspace/markup.c		file \| annotate \| diff \| comparison \| revisions
libpurple/protocols/myspace/myspace.c		file \| annotate \| diff \| comparison \| revisions
libpurple/protocols/oscar/oscar.c		file \| annotate \| diff \| comparison \| revisions
libpurple/protocols/yahoo/yahoo.c		file \| annotate \| diff \| comparison \| revisions
libpurple/util.c		file \| annotate \| diff \| comparison \| revisions
libpurple/win32/win32dep.c		file \| annotate \| diff \| comparison \| revisions
pidgin/gtkblist.c		file \| annotate \| diff \| comparison \| revisions
pidgin/gtkcellrendererexpander.c		file \| annotate \| diff \| comparison \| revisions
pidgin/gtkconv.c		file \| annotate \| diff \| comparison \| revisions
pidgin/gtkimhtmltoolbar.c		file \| annotate \| diff \| comparison \| revisions
pidgin/gtkmain.c		file \| annotate \| diff \| comparison \| revisions
pidgin/gtknotify.c		file \| annotate \| diff \| comparison \| revisions
pidgin/gtkprefs.c		file \| annotate \| diff \| comparison \| revisions

Mercurial > pidgin3 / changeset

changeset

explicit merge of '99e23c8bc2b14ac7facd9d548f02beeda582ac68'