Mercurial > pidgin
comparison .mtn-ignore @ 24750:95ef7beb926b
merge of '6ac9187d4f4437a087d58d63489c47664121f0b5'
and 'f1327672337219c8907eea2d335efb0035e4b39e'
author | Kevin Stange <kevin@simguy.net> |
---|---|
date | Wed, 03 Dec 2008 03:09:32 +0000 |
parents | 42fe79ca351d |
children | 10e1f3c1d0db 2c95b7c57ebb |
comparison
equal
deleted
inserted
replaced
24749:333f03472486 | 24750:95ef7beb926b |
---|---|
11 .*\.dll$ | 11 .*\.dll$ |
12 .*\.exe$ | 12 .*\.exe$ |
13 intltool-.* | 13 intltool-.* |
14 Doxyfile(\.mingw)?$ | 14 Doxyfile(\.mingw)?$ |
15 aclocal.m4 | 15 aclocal.m4 |
16 autogen.args | |
16 compile | 17 compile |
17 config.cache | 18 config.cache |
18 config.guess | 19 config.guess |
19 config.h$ | 20 config.h$ |
20 config.h.in | 21 config.h.in |
36 pidgin-.*.tar.bz2 | 37 pidgin-.*.tar.bz2 |
37 pidgin-*.*.*-win32bin$ | 38 pidgin-*.*.*-win32bin$ |
38 pidgin/pidgin$ | 39 pidgin/pidgin$ |
39 pidgin/pixmaps/emotes/default/24/theme | 40 pidgin/pixmaps/emotes/default/24/theme |
40 pidgin/pixmaps/emotes/none/theme | 41 pidgin/pixmaps/emotes/none/theme |
42 pidgin/pixmaps/emotes/small/16/theme | |
41 pidgin/plugins/musicmessaging/music-messaging-bindings.c | 43 pidgin/plugins/musicmessaging/music-messaging-bindings.c |
42 pidgin/plugins/perl/common/Makefile.PL$ | 44 pidgin/plugins/perl/common/Makefile.PL$ |
45 pidgin/plugins/perl/common/Makefile.old | |
43 pidgin/win32/pidgin_dll_rc.rc$ | 46 pidgin/win32/pidgin_dll_rc.rc$ |
44 pidgin/win32/pidgin_exe_rc.rc$ | 47 pidgin/win32/pidgin_exe_rc.rc$ |
45 install-sh | 48 install-sh |
46 libpurple/dbus-bindings.c | 49 libpurple/dbus-bindings.c |
47 libpurple/dbus-types.c | 50 libpurple/dbus-types.c |
48 libpurple/dbus-types.h | 51 libpurple/dbus-types.h |
49 libpurple/example/nullclient | 52 libpurple/example/nullclient |
50 libpurple/gconf/purple.schemas$ | 53 libpurple/gconf/purple.schemas$ |
51 libpurple/plugins/dbus-example-bindings.c | 54 libpurple/plugins/dbus-example-bindings.c |
52 libpurple/plugins/perl/common/Makefile.PL$ | 55 libpurple/plugins/perl/common/Makefile.PL$ |
56 libpurple/plugins/perl/common/Makefile.old | |
53 libpurple/plugins/perl/common/const-c.inc | 57 libpurple/plugins/perl/common/const-c.inc |
54 libpurple/plugins/perl/common/const-xs.inc | 58 libpurple/plugins/perl/common/const-xs.inc |
55 libpurple/plugins/perl/common/lib | 59 libpurple/plugins/perl/common/lib |
56 libpurple/purple.h$ | 60 libpurple/purple.h$ |
57 libpurple/purple-client-bindings.c | 61 libpurple/purple-client-bindings.c |