diff .mtn-ignore @ 27906:6ecfc6b9667c

propagate from branch 'im.pidgin.pidgin' (head ca4b6e987b967927b0f8bd001bc33440a6885000) to branch 'im.pidgin.pidgin.yaz' (head 7a92169e2ac82026d2b2918ed9662c7fd42e3280)
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Mon, 17 Nov 2008 06:15:33 +0000
parents 42fe79ca351d
children 10e1f3c1d0db 2c95b7c57ebb
line wrap: on
line diff
--- a/.mtn-ignore	Fri Oct 31 08:37:42 2008 +0000
+++ b/.mtn-ignore	Mon Nov 17 06:15:33 2008 +0000
@@ -39,8 +39,10 @@
 pidgin/pidgin$
 pidgin/pixmaps/emotes/default/24/theme
 pidgin/pixmaps/emotes/none/theme
+pidgin/pixmaps/emotes/small/16/theme
 pidgin/plugins/musicmessaging/music-messaging-bindings.c
 pidgin/plugins/perl/common/Makefile.PL$
+pidgin/plugins/perl/common/Makefile.old
 pidgin/win32/pidgin_dll_rc.rc$
 pidgin/win32/pidgin_exe_rc.rc$
 install-sh
@@ -51,6 +53,7 @@
 libpurple/gconf/purple.schemas$
 libpurple/plugins/dbus-example-bindings.c
 libpurple/plugins/perl/common/Makefile.PL$
+libpurple/plugins/perl/common/Makefile.old
 libpurple/plugins/perl/common/const-c.inc
 libpurple/plugins/perl/common/const-xs.inc
 libpurple/plugins/perl/common/lib