comparison configure.ac @ 29343:bf4a33bd020b

merge of '0990bc18c1ec4f05a29aeb8f55d4d28a08152cc6' and 'd5e93b05ae1a8f5296a0a9b069c630630285d3c3'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Fri, 25 Dec 2009 21:33:50 +0000
parents a52831eada67
children 10eaca0bf01a
comparison
equal deleted inserted replaced
29342:3ad839deed75 29343:bf4a33bd020b
2500 m4macros/Makefile 2500 m4macros/Makefile
2501 pidgin.apspec 2501 pidgin.apspec
2502 pidgin/Makefile 2502 pidgin/Makefile
2503 pidgin/pidgin.pc 2503 pidgin/pidgin.pc
2504 pidgin/pidgin-uninstalled.pc 2504 pidgin/pidgin-uninstalled.pc
2505 pidgin/pidgin-2.pc
2506 pidgin/pidgin-2-uninstalled.pc
2505 pidgin/pixmaps/Makefile 2507 pidgin/pixmaps/Makefile
2506 pidgin/pixmaps/emotes/default/24/Makefile 2508 pidgin/pixmaps/emotes/default/24/Makefile
2507 pidgin/pixmaps/emotes/none/Makefile 2509 pidgin/pixmaps/emotes/none/Makefile
2508 pidgin/pixmaps/emotes/small/16/Makefile 2510 pidgin/pixmaps/emotes/small/16/Makefile
2509 pidgin/plugins/Makefile 2511 pidgin/plugins/Makefile
2517 pidgin/plugins/ticker/Makefile 2519 pidgin/plugins/ticker/Makefile
2518 libpurple/example/Makefile 2520 libpurple/example/Makefile
2519 libpurple/gconf/Makefile 2521 libpurple/gconf/Makefile
2520 libpurple/purple.pc 2522 libpurple/purple.pc
2521 libpurple/purple-uninstalled.pc 2523 libpurple/purple-uninstalled.pc
2524 libpurple/purple-2.pc
2525 libpurple/purple-2-uninstalled.pc
2522 libpurple/plugins/Makefile 2526 libpurple/plugins/Makefile
2523 libpurple/plugins/mono/Makefile 2527 libpurple/plugins/mono/Makefile
2524 libpurple/plugins/mono/api/Makefile 2528 libpurple/plugins/mono/api/Makefile
2525 libpurple/plugins/mono/loader/Makefile 2529 libpurple/plugins/mono/loader/Makefile
2526 libpurple/plugins/perl/Makefile 2530 libpurple/plugins/perl/Makefile