Mercurial > pidgin.yaz
diff .mtn-ignore @ 20407:1122d47583a1
explicit merge of 'd42ad2da81f881b2fbd2fb080cc70a843bc70d02'
and '8582c561c020d2d1e8d358e2e7cd9e3da113ed9e'
to branch 'im.pidgin.cpw.khc.msnp14'
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Wed, 02 May 2007 05:25:27 +0000 |
parents | 93f1801d4cc6 |
children | 56c61eb40850 |
line wrap: on
line diff
--- a/.mtn-ignore Sun Apr 15 20:12:06 2007 +0000 +++ b/.mtn-ignore Wed May 02 05:25:27 2007 +0000 @@ -8,53 +8,60 @@ .*\.dll$ .*\.exe$ intltool-.* -Doxyfile +Doxyfile$ aclocal.m4 compile config.guess -config.h +config.h$ config.h.in config.log config.status config.sub -configure +configure$ finch/finch finch/libgnt/gntmarshal.c finch/libgnt/gntmarshal.h depcomp -doc/finch.1 -doc/pidgin.1 +doc/finch.1$ +doc/pidgin.1$ doc/html -pidgin.apspec -pidgin.desktop -pidgin.spec +pidgin.apspec$ +pidgin.desktop$ +pidgin.spec$ pidgin-.*.tar.gz pidgin-.*.tar.bz2 pidgin/pidgin pidgin/plugins/musicmessaging/music-messaging-bindings.c -pidgin/plugins/perl/common/Makefile.PL -pidgin/win32/pidgin_dll_rc.rc -pidgin/win32/pidgin_exe_rc.rc +pidgin/plugins/perl/common/Makefile.PL$ +pidgin/win32/pidgin_dll_rc.rc$ +pidgin/win32/pidgin_exe_rc.rc$ install-sh libpurple/dbus-bindings.c libpurple/dbus-types.c libpurple/dbus-types.h libpurple/example/nullclient -libpurple/gconf/purple.schemas +libpurple/gconf/purple.schemas$ libpurple/plugins/dbus-example-bindings.c -libpurple/plugins/perl/common/Makefile.PL +libpurple/plugins/perl/common/Makefile.PL$ libpurple/plugins/perl/common/const-c.inc libpurple/plugins/perl/common/const-xs.inc libpurple/plugins/perl/common/lib -libpurple/win32/libpurplerc.rc +libpurple/purple-client-bindings.c +libpurple/purple-client-bindings.h +libpurple/purple-client-example +libpurple/tests/check_libpurple +libpurple/win32/libpurplerc.rc$ libtool local.mak ltmain.sh missing mkinstalldirs po/Makefile.in.in -po/POTFILES +po/POTFILES$ +po/missing +po/notexist +po/pidgin.pot po/stamp-it stamp-h1 win32-install-dir(\.release)? -VERSION +VERSION$