comparison .mtn-ignore @ 26045:a62d10cce27a

merge of '8b14f9ccca52482ea771f52730b3b9f59bac6b06' and 'a93ae380e74b703e2539986a5c084eb6ac685e1c'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Tue, 25 Nov 2008 02:59:47 +0000
parents 42fe79ca351d
children 10e1f3c1d0db 2c95b7c57ebb
comparison
equal deleted inserted replaced
26044:ca0c9cc50e35 26045:a62d10cce27a
37 pidgin-.*.tar.bz2 37 pidgin-.*.tar.bz2
38 pidgin-*.*.*-win32bin$ 38 pidgin-*.*.*-win32bin$
39 pidgin/pidgin$ 39 pidgin/pidgin$
40 pidgin/pixmaps/emotes/default/24/theme 40 pidgin/pixmaps/emotes/default/24/theme
41 pidgin/pixmaps/emotes/none/theme 41 pidgin/pixmaps/emotes/none/theme
42 pidgin/pixmaps/emotes/small/16/theme
42 pidgin/plugins/musicmessaging/music-messaging-bindings.c 43 pidgin/plugins/musicmessaging/music-messaging-bindings.c
43 pidgin/plugins/perl/common/Makefile.PL$ 44 pidgin/plugins/perl/common/Makefile.PL$
44 pidgin/plugins/perl/common/Makefile.old 45 pidgin/plugins/perl/common/Makefile.old
45 pidgin/win32/pidgin_dll_rc.rc$ 46 pidgin/win32/pidgin_dll_rc.rc$
46 pidgin/win32/pidgin_exe_rc.rc$ 47 pidgin/win32/pidgin_exe_rc.rc$