diff libpurple/dbus-purple.h @ 32750:cc258d58ee56

merge of 'a6a5be7291d88240cd7a6b7034ac9942d5bfba4b' and 'f1f5a7e9b4ed4a9ffe523909a8a68b49928f2731'
author Mark Doliner <mark@kingant.net>
date Sat, 31 Mar 2012 21:29:04 +0000
parents 44b4e8bd759b
children
line wrap: on
line diff