# HG changeset patch
# User Sadrul Habib Chowdhury <imadil@gmail.com>
# Date 1189749603 0
# Node ID a1c5518c445c007d2269330885025b5593d4c5b1
# Parent  ef35d7f5a5b67f7d9b79482f2bfd2e3887494828# Parent  6dffb325531508fb7b2c3f106757add74612fadd
merge of '83f50edf9e879470bb69228cdfb494cd66b76d27'
     and 'c88cbf0cbd20ab395ceec705909ed6dd55c76799'

diff -r ef35d7f5a5b6 -r a1c5518c445c configure.ac
--- a/configure.ac	Fri Sep 14 05:52:04 2007 +0000
+++ b/configure.ac	Fri Sep 14 06:00:03 2007 +0000
@@ -2244,7 +2244,6 @@
 		   finch/Makefile
 		   finch/libgnt/Makefile
 		   finch/libgnt/gnt.pc
-		   finch/libgnt/pygnt/Makefile
 		   finch/libgnt/wms/Makefile
 		   finch/plugins/Makefile
 		   po/Makefile.in
diff -r ef35d7f5a5b6 -r a1c5518c445c pidgin/pixmaps/status/Makefile.am
--- a/pidgin/pixmaps/status/Makefile.am	Fri Sep 14 05:52:04 2007 +0000
+++ b/pidgin/pixmaps/status/Makefile.am	Fri Sep 14 06:00:03 2007 +0000
@@ -3,6 +3,7 @@
 EXTRA_DIST = \
 	Makefile.mingw \
 	11/Makefile.mingw \
+	11/rtl/Makefile.mingw \
 	16/Makefile.mingw \
 	16/rtl/Makefile.mingw \
 	22/Makefile.mingw \