comparison libpurple/dbus-server.c @ 20086:2a4550082d66

merge of '5eb5c567b85fa0c57d69ad649e737c11b45b70ec' and 'e82cd09b229587cf4165466490fa52898aedfb82'
author Evan Schoenberg <evan.s@dreskin.net>
date Sun, 16 Sep 2007 05:31:33 +0000
parents 44b4e8bd759b
children d8a47f12a3c4
comparison
equal deleted inserted replaced
20084:de39f3855e8f 20086:2a4550082d66