# HG changeset patch
# User John Bailey <rekkanoryo@rekkanoryo.org>
# Date 1275180405 0
# Node ID f5d4d3800e813893b1d1eaf4c94301d99cd9b08b
# Parent  d60313011111b35b486019c2282b9cf39e453c64# Parent  a84207b9d171f2d050a253126b3b9ca804395d4d
merge of '0c5825d5c8cf7e382a744e266bb4c67753d24db4'
     and '25efd792c3cc52430ed464eaeb331c3ee9fd9ced'

diff -r d60313011111 -r f5d4d3800e81 po/POTFILES.in
--- a/po/POTFILES.in	Sat May 29 22:52:14 2010 +0000
+++ b/po/POTFILES.in	Sun May 30 00:46:45 2010 +0000
@@ -125,6 +125,7 @@
 libpurple/protocols/mxit/http.c
 libpurple/protocols/mxit/login.c
 libpurple/protocols/mxit/mxit.c
+libpurple/protocols/mxit/multimx.c
 libpurple/protocols/mxit/profile.c
 libpurple/protocols/mxit/protocol.c
 libpurple/protocols/mxit/roster.c
@@ -145,6 +146,7 @@
 libpurple/protocols/oscar/oft.c
 libpurple/protocols/oscar/oscar.c
 libpurple/protocols/oscar/peer.c
+libpurple/protocols/oscar/util.c
 libpurple/protocols/qq/buddy_info.c
 libpurple/protocols/qq/buddy_list.c
 libpurple/protocols/qq/buddy_memo.c