Mercurial > pidgin

diff libpurple/conversation.h @ 25135:6baa6a829a90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge of 'a0b951af90f1a780445f21b51b22e57f6a3f699e' and 'ec7dddcd8ff1500f8e51eeeb226a1d478fb519c7'
author Marcus Lundblad <ml@update.uu.se>
date Wed, 01 Oct 2008 22:25:47 +0000
parents c87f7c6ab57c
children d8452c0bec7b 22b8a92fb5ee
line wrap: on
line diff
--- a/libpurple/conversation.h	Wed Oct 01 22:25:36 2008 +0000
+++ b/libpurple/conversation.h	Wed Oct 01 22:25:47 2008 +0000
@@ -114,7 +114,7 @@
 	                                        which are only open for
 	                                        internal UI purposes
 	                                        (e.g. for contact-aware
-	                                         conversions).           */
+	                                         conversations).           */
 	PURPLE_MESSAGE_NICK        = 0x0020, /**< Contains your nick.      */
 	PURPLE_MESSAGE_NO_LOG      = 0x0040, /**< Do not log.              */
 	PURPLE_MESSAGE_WHISPER     = 0x0080, /**< Whispered message.       */