changeset 27146:3cd831d4915f

merge of 'bfb17183fbbf44cc19720d4d11594a7fdaad25de' and 'f525448585711b2790cb6158b85897a15b546241'
author Paul Aurich <paul@darkrain42.org>
date Mon, 22 Jun 2009 16:39:58 +0000
parents 454d46e9cbb7 (current diff) 14baa6cb1c2b (diff)
children ef9e68020265
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jun 22 08:15:58 2009 +0000
+++ b/ChangeLog	Mon Jun 22 16:39:58 2009 +0000
@@ -98,7 +98,7 @@
 	  (Dmitry Petroff)
 	* Draw the user's buddy icon at the bottom of the Buddy List with rounded
 	  corners for visual consistency with the actual icons in the Buddy List.
-	  (kostaa)
+	  (Kosta Arvanitis)
 
 	Finch:
 	* The hardware cursor is updated correctly. This will be useful
--- a/pidgin/plugins/disco/Makefile.mingw	Mon Jun 22 08:15:58 2009 +0000
+++ b/pidgin/plugins/disco/Makefile.mingw	Mon Jun 22 16:39:58 2009 +0000
@@ -46,6 +46,8 @@
 			-lglib-2.0 \
 			-lgdk-win32-2.0 \
 			-lgobject-2.0 \
+			-lpango-1.0 \
+			-lgdk_pixbuf-2.0 \
 			-lintl \
 			-lpurple \
 			-lpidgin