diff libpurple/desktopitem.c @ 25637:d03177395ae0

merge of '7dc734d96688ae822246be79196106858b5e6670' and 'ca41f163a139123ff8ac7752424944338396520f'
author Peter Hjalmarsson <xake@rymdraket.net>
date Wed, 25 Feb 2009 22:59:41 +0000
parents 35b4f1dc4c8d
children a6e3cb32cdd2
line wrap: on
line diff