comparison libpurple/desktopitem.c @ 29053:c06e1f777e42

merge of '32e63a51dbb65b8b63d134bde098d40167574148' and '4be5956e86cfd7ac16331092beb6255db19e0640'
author John Bailey <rekkanoryo@rekkanoryo.org>
date Sun, 29 Nov 2009 16:16:49 +0000
parents f1437342cc0e
children c60c9c95bb00
comparison
equal deleted inserted replaced
29052:f2a69bee9ef6 29053:c06e1f777e42