comparison libpurple/dbus-server.c @ 16651:8ef2d30bc1bf

merge of '7dbb9ed2994bf4252f9ae93a2eb6072800082022' and 'd03e6584d548b2fec6afd50eccf79344570173f3'
author Mark Doliner <mark@kingant.net>
date Sun, 29 Apr 2007 07:40:40 +0000
parents 598b1b15b199
children 3130a2cfe4e0
comparison
equal deleted inserted replaced
16649:985bf8c7b8d1 16651:8ef2d30bc1bf