Mercurial > pidgin
view .mtn-ignore @ 31719:e0856c50cdd8
Fix the merge some more
I don't know whether this was me, kdiff3, or monotone on something.
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sun, 26 Jun 2011 20:37:03 +0000 |
parents | 2b0c2a0f3134 |
children | 0c214d7ad8bc |
line wrap: on
line source
(.*/)?TAGS$ (.*/)?\.svn .*/?.*\.pc$ .*/?Makefile(\.in)?$ .*/?Makefile\.am\.mingw$ .*/perl/common/[^/]+\.c$ .*/perl/common/blib.* .*/perl/common/pm_to_blib$ .*\.bs$ .*\.def$ .*\.dll$ .*\.exe$ .*\.loT$ Doxyfile(\.mingw)?$ VERSION$ \.tx aclocal.m4 autogen.args compile config.cache config.guess config.h$ config.h.in config.log config.status config.sub configure$ depcomp doc/finch.1$ doc/html doc/pidgin.1$ finch/finch$ finch/libgnt/gntmarshal.c finch/libgnt/gntmarshal.h install-sh intltool-.* libpurple/dbus-bindings.c libpurple/dbus-signals.c libpurple/dbus-types.c libpurple/dbus-types.h libpurple/example/nullclient libpurple/gconf/purple.schemas$ libpurple/marshallers.[ch] 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 libpurple/purple-client-bindings.c libpurple/purple-client-bindings.h libpurple/purple-client-example libpurple/purple.h$ libpurple/tests/check_libpurple libpurple/tests/libpurple.. libpurple/version.h$ libpurple/win32/libpurplerc.rc$ libtool local.mak ltmain.sh missing mkinstalldirs package_revision.h package_revision_raw.txt pidgin-*.*.*-dbgsym$ pidgin-*.*.*-dbgsym.zip$ pidgin-*.*.*-win32-bin.zip$ pidgin-*.*.*-win32bin$ pidgin-.*.tar.bz2 pidgin-.*.tar.gz pidgin.apspec$ pidgin.desktop$ pidgin.spec$ 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/nsis/gtk-runtime-*.*.*.*.zip pidgin/win32/nsis/gtk_runtime_stage$ pidgin/win32/nsis/langmacros.nsh pidgin/win32/nsis/nsis_translations.desktop pidgin/win32/nsis/pidgin-spellcheck-preselect.nsh pidgin/win32/nsis/pidgin-spellcheck.nsh pidgin/win32/nsis/pidgin-translations.nsh$ pidgin/win32/nsis/translations pidgin/win32/pidgin_dll_rc.rc$ pidgin/win32/pidgin_exe_rc.rc$ po/Makefile.in.in po/POTFILES$ po/missing po/notexist po/pidgin.pot po/stamp-it stamp-h1 win32-install-dir(\.release)?