Mercurial > pidgin
comparison libpurple/dbus-server.c @ 29862:d64a0d8ff36d
merge of '22ad9aecc804e89b1101cde696e58490a7efd603'
and '4c5c524129704ad1119bd51ae362bdb123bdaf75'
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 01 May 2010 20:10:21 +0000 |
parents | 5819bf02659e |
children | 9f6b8e5998ec |
comparison
equal
deleted
inserted
replaced
29857:4428b676c698 | 29862:d64a0d8ff36d |
---|