# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1190510868 0
# Node ID c905f5824422b53d0b70390399e448551d7ada62
# Parent  53545dbfd38fdd5f0ec2e5e7941e70b1a3bd3c09# Parent  54ff514fdd049dbb9dc9bd84db038fcdf789822a
merge of '45c21fe8414cc05dba5ae7500e19b9e06c78e283'
     and '78194cd942a5fcb3f4eb41f3cdb4c7a5fb5b2b67'

diff -r 54ff514fdd04 -r c905f5824422 autogen.sh
--- a/autogen.sh	Sun Sep 23 01:25:56 2007 +0000
+++ b/autogen.sh	Sun Sep 23 01:27:48 2007 +0000
@@ -58,7 +58,7 @@
 done
 
 libtoolize -c -f --automake
-glib-gettextize --force --copy --previous
+glib-gettextize --force --copy
 intltoolize --force --copy
 aclocal $ACLOCAL_FLAGS || exit;
 autoheader || exit;
diff -r 54ff514fdd04 -r c905f5824422 po/POTFILES.in
--- a/po/POTFILES.in	Sun Sep 23 01:25:56 2007 +0000
+++ b/po/POTFILES.in	Sun Sep 23 01:27:48 2007 +0000
@@ -91,11 +91,13 @@
 libpurple/protocols/jabber/usermood.c
 libpurple/protocols/jabber/usernick.c
 libpurple/protocols/jabber/xdata.c
+libpurple/protocols/msn/contact.c
 libpurple/protocols/msn/dialog.c
 libpurple/protocols/msn/error.c
 libpurple/protocols/msn/msn.c
 libpurple/protocols/msn/nexus.c
 libpurple/protocols/msn/notification.c
+libpurple/protocols/msn/oim.c
 libpurple/protocols/msn/servconn.c
 libpurple/protocols/msn/session.c
 libpurple/protocols/msn/state.c