# HG changeset patch
# User masca@cpw.pidgin.im
# Date 1310088313 0
# Node ID eeb3a2f7f587af90fb9f3453e57e01f0c391d714
# Parent  a8f62638417e5241ddfead911edb51bae459e71e
Credit Quenin Brandon for the max size in incoming smileys patch. Changelog it.

diff -r a8f62638417e -r eeb3a2f7f587 COPYRIGHT
--- a/COPYRIGHT	Thu Jul 07 04:47:10 2011 +0000
+++ b/COPYRIGHT	Fri Jul 08 01:25:13 2011 +0000
@@ -71,6 +71,7 @@
 Éric Boumaour
 Chris Boyle
 Stanislav Brabec
+Quentin Brandon
 Derrick J Brashear
 Mauro Sérgio Ferreira Brasil
 Luke Bratch
diff -r a8f62638417e -r eeb3a2f7f587 ChangeLog
--- a/ChangeLog	Thu Jul 07 04:47:10 2011 +0000
+++ b/ChangeLog	Fri Jul 08 01:25:13 2011 +0000
@@ -1,6 +1,10 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.9.1 (MM/DD/YYYY):
+	Pidgin:
+	* Make the max size of incoming smileys a pref instead of hardcoding it.
+	  (Quentin Brandon)(#5231)
+
 	Gadu-Gadu:
 	* Fixed searching for buddies in public directory. (Tomasz Wasilczyk)
 	  (#5242)