comparison libpurple/dbus-server.h @ 29829:90dbc46a771f

Fixup merge
author Marcus Lundblad <ml@update.uu.se>
date Mon, 22 Mar 2010 22:26:14 +0000
parents c900484e41c0
children 02a2e8183b1d
comparison
equal deleted inserted replaced
29828:f14cbb6a28a7 29829:90dbc46a771f