diff libpurple/dbus-server.h @ 26462:b0a9c48b5f69

merge of '2d0e977ba883c0b9d24d52360839cfed7cf1f2a6' and 'e9514d92cd62759a80a75f93b308e4fd05afe673'
author Mike Ruprecht <maiku@soc.pidgin.im>
date Mon, 30 Mar 2009 04:15:53 +0000
parents 584063555949
children c900484e41c0
line wrap: on
line diff