diff ChangeLog @ 22823:fc1e708ddf92

merge of 'dc85c2329304dd6f567820b55939193328f9e506' and 'e0c898b6c75ee358dd659b7fde7551c304f48413'
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Sat, 03 May 2008 03:02:25 +0000
parents 900c7b5660d5
children 7b827f52ed0e
line wrap: on
line diff
--- a/ChangeLog	Sat May 03 02:12:26 2008 +0000
+++ b/ChangeLog	Sat May 03 03:02:25 2008 +0000
@@ -24,6 +24,9 @@
 	  workspaces the "Present" option should.
 	* Add a preference to set Escape as the keyboard shortcut for closing
 	  the conversation window.
+	* Add an option in the context menu to disable smileys in the selected
+	  text in the conversation history/log viewer. This should help people who
+	  regularly paste code in conversations.
 
 	General:
 	* The configure script now dies on more absent dependencies.  The