diff libpurple/conversation.h @ 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 6bf32c9e15a7
children bd7244f3d491 f296be2a1039
line wrap: on
line diff
--- a/libpurple/conversation.h	Tue Sep 18 16:32:01 2007 +0000
+++ b/libpurple/conversation.h	Tue Sep 18 16:32:46 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file conversation.h Conversation API
  * @ingroup core
- *
- * purple
+ */
+
+/* purple
  *
  * Purple is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this