comparison libpurple/dbus-server.h @ 26818:9cb95f21979d

merge of '7e8d9f694132bc0cdbb6088ca5b557480c71ba45' and 'f19814a9bc18cc2b84bdfc83d02569128c4fd66f'
author Paul Aurich <paul@darkrain42.org>
date Mon, 04 May 2009 02:57:02 +0000
parents 584063555949
children c900484e41c0
comparison
equal deleted inserted replaced
26815:0cc77ced0ae3 26818:9cb95f21979d