diff libpurple/dbus-server.h @ 30395:1dd3ed053628

explicit merge of '92760ff5074d9bcc75f59473f013ca8a959a85b8' and 'eadc83c534fbbc673a6876ddb1e0bdac8428c07b'
author ivan.komarov@soc.pidgin.im
date Thu, 29 Jul 2010 00:06:56 +0000
parents c900484e41c0
children 02a2e8183b1d
line wrap: on
line diff