comparison libpurple/dbus-server.h @ 15632:deea490f2d91

merge of '46383975a415a7c7a37796205fd5ee523d5bc5e6' and '8411ecb9a8c1bd0d0a87639e157b39d7e20934bb'
author Evan Schoenberg <evan.s@dreskin.net>
date Wed, 14 Feb 2007 04:24:48 +0000
parents 5fe8042783c1
children 32c366eeeb99
comparison
equal deleted inserted replaced
15630:593534b724b0 15632:deea490f2d91