diff libpurple/conversation.h @ 24263:e4f4ffd7ed4c

propagate from branch 'im.pidgin.pidgin' (head 4e892c470840f4ed8b012015b15ff8956166028a) to branch 'im.pidgin.pidgin.openq' (head 2dab44421846610c60c31aa1402de99f4001b996)
author SHiNE CsyFeK <csyfek@gmail.com>
date Tue, 28 Oct 2008 16:59:07 +0000
parents c87f7c6ab57c
children d8452c0bec7b 22b8a92fb5ee
line wrap: on
line diff
--- a/libpurple/conversation.h	Tue Oct 28 16:48:36 2008 +0000
+++ b/libpurple/conversation.h	Tue Oct 28 16:59:07 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.       */