Mercurial > pidgin.yaz
diff libpurple/dbus-useful.c @ 29661:58e1e1463b6e
Manual merge
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 01 Jan 2009 21:16:19 +0000 |
parents | 32c366eeeb99 |
children | 4ca97b26a8fb f75041cb3fec |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Thu, 01 Jan 2009 21:16:19 +0000 |
parents | 32c366eeeb99 |
children | 4ca97b26a8fb f75041cb3fec |