Mercurial > pidgin.yaz
diff libpurple/dbus-bindings.h @ 29664:e841bad196e0
A little manual merge...
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Fri, 06 Feb 2009 23:19:27 +0000 |
parents | 6bf32c9e15a7 |
children | 584063555949 |
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Fri, 06 Feb 2009 23:19:27 +0000 |
parents | 6bf32c9e15a7 |
children | 584063555949 |