# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1177462139 0
# Node ID 7f8fd78bf62bfaa996e4e4b232b01212ab3e5939
# Parent  8a4b1d1cd076ce0145321a5544e5d50256f6bd5f# Parent  f1d06ebe7ead738458314100863cf1b734402c92
merge of '88a78587504cdd42570461a2b391b54b5c3d4aab'
     and 'ded0ab999cf695de558bd68830366521ccd637ba'

diff -r 8a4b1d1cd076 -r 7f8fd78bf62b pidgin/pixmaps/toolbar/Makefile.am
--- a/pidgin/pixmaps/toolbar/Makefile.am	Wed Apr 25 00:45:17 2007 +0000
+++ b/pidgin/pixmaps/toolbar/Makefile.am	Wed Apr 25 00:48:59 2007 +0000
@@ -1,1 +1,6 @@
 SUBDIRS = 16 22
+
+EXTRA_DIST = \
+	Makefile.mingw \
+	16/Makefile.mingw \
+	22/Makefile.mingw
diff -r 8a4b1d1cd076 -r 7f8fd78bf62b pidgin/pixmaps/tray/Makefile.am
--- a/pidgin/pixmaps/tray/Makefile.am	Wed Apr 25 00:45:17 2007 +0000
+++ b/pidgin/pixmaps/tray/Makefile.am	Wed Apr 25 00:48:59 2007 +0000
@@ -2,5 +2,6 @@
 
 EXTRA_DIST = \
 	Makefile.mingw \
+	16/Makefile.mingw \
 	22/Makefile.mingw