Mercurial > pidgin
comparison libpurple/dbus-define-api.h @ 20407:1122d47583a1
explicit merge of 'd42ad2da81f881b2fbd2fb080cc70a843bc70d02'
and '8582c561c020d2d1e8d358e2e7cd9e3da113ed9e'
to branch 'im.pidgin.cpw.khc.msnp14'
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Wed, 02 May 2007 05:25:27 +0000 |
parents | 32c366eeeb99 |
children |
comparison
equal
deleted
inserted
replaced
20406:7acc792487f2 | 20407:1122d47583a1 |
---|