comparison libpurple/desktopitem.h @ 22684:0ad88bfdde60

merge of '52e841c96296ab164c2be839e9d404dc1f9a6a9e' and '7de0a46d8ca302d58be14767f545150eea346039'
author Etan Reisner <pidgin@unreliablesource.net>
date Wed, 23 Apr 2008 02:59:37 +0000
parents 6bf32c9e15a7
children 584063555949
comparison
equal deleted inserted replaced
22680:c7c97c62e131 22684:0ad88bfdde60