diff ChangeLog @ 20108:88b97e07f35f

merge of '688a896af7f228132e0f78057e7ed5812c3f7b13' and 'a6d6e5d83afac011fd739de6e393618695171e7c'
author Will Thompson <will.thompson@collabora.co.uk>
date Tue, 18 Sep 2007 16:32:46 +0000
parents a4e3ea21360b
children df24e0153753
line wrap: on
line diff
--- a/ChangeLog	Tue Sep 18 16:32:01 2007 +0000
+++ b/ChangeLog	Tue Sep 18 16:32:46 2007 +0000
@@ -12,6 +12,9 @@
 	  is listening to some soothing music.
 	* 'Move to' menu in buddy list context menu for moving buddies to
   	   other groups
+	* Move "Smiley" to the top-level of the toolbar
+	* Save Pidgin's display in the command line for session
+	  restoration.  (David Mohr)
 
 Version 2.2.0 (09/13/2007):
 	http://developer.pidgin.im/query?status=closed&milestone=2.2.0