Mercurial > pidgin
comparison libpurple/dbus-server.c @ 24901:fc32b392c968
merge of '1573f5f4950069e05f77f6b74e1627bfae9667c5'
and 'ea93164d46e9e153a99807bc9474f99dfbca41dc'
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Sat, 03 Jan 2009 20:43:50 +0000 |
parents | 8282911d5e17 |
children | 61f3a9f7a220 |
comparison
equal
deleted
inserted
replaced
24900:6267675cbc1d | 24901:fc32b392c968 |
---|