diff libpurple/desktopitem.h @ 20142:743cb3444b6b

merge of '4f72579666e002cb42772fe52db9422fdbcfcdbb' and '7b44471a0827c3a4fcb9b5cb9d6af5c8be1c473e'
author Casey Harkins <charkins@pidgin.im>
date Tue, 18 Sep 2007 01:02:40 +0000
parents 6bf32c9e15a7
children 584063555949
line wrap: on
line diff