# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1191000033 0
# Node ID b92fde9b03a69d5e988bfab5c42d404d5b7fd7f5
# Parent  9850ebd9f964c83ce73408e3bdc85b54dde0484a# Parent  c43a36cb31a668c3c1dd2eff622c098bf2863f85
propagate from branch 'im.pidgin.rlaager.merging.2_2_1_conflicts' (head 193dd268b0be5ca0a4a8fa0e4188452907114be0)
            to branch 'im.pidgin.pidgin' (head 563924526117e45ff6134011258940e8b1988d72)

diff -r c43a36cb31a6 -r b92fde9b03a6 libpurple/account.c
diff -r c43a36cb31a6 -r b92fde9b03a6 libpurple/dnssrv.c
diff -r c43a36cb31a6 -r b92fde9b03a6 libpurple/ft.c
diff -r c43a36cb31a6 -r b92fde9b03a6 libpurple/notify.c
diff -r c43a36cb31a6 -r b92fde9b03a6 libpurple/protocols/myspace/markup.h
diff -r c43a36cb31a6 -r b92fde9b03a6 libpurple/protocols/myspace/session.c
diff -r c43a36cb31a6 -r b92fde9b03a6 libpurple/protocols/myspace/session.h
diff -r c43a36cb31a6 -r b92fde9b03a6 libpurple/protocols/myspace/user.h
diff -r c43a36cb31a6 -r b92fde9b03a6 libpurple/protocols/myspace/zap.c
diff -r c43a36cb31a6 -r b92fde9b03a6 libpurple/protocols/myspace/zap.h
diff -r c43a36cb31a6 -r b92fde9b03a6 libpurple/upnp.c
diff -r c43a36cb31a6 -r b92fde9b03a6 pidgin/gtkaccount.c
diff -r c43a36cb31a6 -r b92fde9b03a6 pidgin/gtkdialogs.c
diff -r c43a36cb31a6 -r b92fde9b03a6 pidgin/gtkimhtml.c
diff -r c43a36cb31a6 -r b92fde9b03a6 pidgin/gtkmain.c
diff -r c43a36cb31a6 -r b92fde9b03a6 pidgin/gtksavedstatuses.c
diff -r c43a36cb31a6 -r b92fde9b03a6 pidgin/gtkutils.c
diff -r c43a36cb31a6 -r b92fde9b03a6 pidgin/pidgin.h