comparison libpurple/desktopitem.h @ 23404:3c1f1bed5be2

merge of '57be04f07f9fdc005b620053ae4f09dd1e27ebb3' and '582755b8228024381c2a9e110de35f0aaedd5dc1'
author Evan Schoenberg <evan.s@dreskin.net>
date Wed, 02 Jul 2008 00:06:25 +0000
parents 6bf32c9e15a7
children 584063555949
comparison
equal deleted inserted replaced
22773:c9bc2d0215ed 23404:3c1f1bed5be2