diff libpurple/conversation.h @ 24427:5950e7a32c4f

merge of '12d71b833c7d3451c58c50e6dc621a88d678d474' and '42f888b4f8e15a19002abe6f40a5d89117ee59a7'
author Richard Laager <rlaager@wiktel.com>
date Fri, 14 Nov 2008 07:41:10 +0000
parents c87f7c6ab57c
children d8452c0bec7b 22b8a92fb5ee
line wrap: on
line diff