comparison pidgin/eggtrayicon.h @ 21372:b6b69faafbe3

merge of '37c3d8dfb803b6da542ca98ccd64739e1943072c' and '59ae1baa5170a6a40f17cc5d213864be55009356'
author Will Thompson <will.thompson@collabora.co.uk>
date Sun, 28 Oct 2007 11:04:04 +0000
parents 44b4e8bd759b
children 584063555949
comparison
equal deleted inserted replaced
21371:a41ac7fd19ab 21372:b6b69faafbe3