merge of '4b8995626b208f7442497f98f1142c5fc39f028f'

Sun, 30 May 2010 00:46:45 +0000

author
John Bailey <rekkanoryo@rekkanoryo.org>
date
Sun, 30 May 2010 00:46:45 +0000
changeset 30386
9cf6048913e8
parent 30384
4b8995626b20 (current diff)
parent 30385
e06feabeca2b (diff)
child 30387
b54550983393

merge of '4b8995626b208f7442497f98f1142c5fc39f028f'
and 'e06feabeca2bfac7fbb916a210f1dbd9d691a5da'

--- 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

mercurial