comparison libpurple/desktopitem.c @ 29624:eb72ae3357dc

merge of 'a758341daab23fe08b983dd3e00c8db27e225d59' and 'c651e3b4b90d5aa93b3e45769bab26a0d9fa9039'
author Paul Aurich <paul@darkrain42.org>
date Sat, 20 Mar 2010 16:20:35 +0000
parents f1437342cc0e
children c60c9c95bb00
comparison
equal deleted inserted replaced
29623:40fee5f86bf8 29624:eb72ae3357dc