Mercurial > pidgin
comparison libpurple/dbus-server.h @ 31125:2291381a9dca
merge of '82b5f258a6715492617fdc4b10fbdb1e6d502d2d'
and 'd6123dbf76622d078959b33e7a013efcfd5af34c'
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Sun, 09 Jan 2011 20:28:58 +0000 |
parents | c900484e41c0 |
children | 02a2e8183b1d |
comparison
equal
deleted
inserted
replaced
31124:95c33536ac16 | 31125:2291381a9dca |
---|