# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1085936080 0
# Node ID 668ffb8fec000dde7ef028ade201284142a7f891
# Parent  4ab8f2b8168be0c2f7a741a0b7136462b5173fa0
[gaim-migrate @ 9902]
(12:53:05) nosnilmot: LSchiere: not majorly important, but the pref changes
listed in the ChangeLog are out of sync

committer: Tailor Script <tailor@pidgin.im>

diff -r 4ab8f2b8168b -r 668ffb8fec00 ChangeLog
--- a/ChangeLog	Sun May 30 16:49:27 2004 +0000
+++ b/ChangeLog	Sun May 30 16:54:40 2004 +0000
@@ -58,6 +58,7 @@
 	  be correct again.
 
 	Preference Changes:
+	* Added "Conversation placement - By conversation count"
 	* Added a "none" smiley theme to replace the "Show graphical
 	  smileys" option
 	* Replace default formatting preferences with a dialog to set a
@@ -80,9 +81,6 @@
 	* Removed "Send autoresponse in active conversations", default to no
 	* Removed "Show people joining in window", default to yes
 	* Removed "Show people leaving in window", default to yes
-	* Removed "Show IMs and Chats in same window", default to yes
-	* Merged "IM" and "Chat" options under "Conversations"
-	* Reorganized Preference dialog
 
 version 0.77 (04/22/2004):
 	New Features: