comparison pidgin/gtkdocklet.h @ 15405:14f1a1fad65e

merge of 'a45405c69730ec786c859712b19b4a592882b748' and 'f4549d3dac99a236059a94f69008f09d46080caf'
author Daniel Atallah <daniel.atallah@gmail.com>
date Wed, 24 Jan 2007 21:06:46 +0000
parents 5fe8042783c1
children d75099d2567e
comparison
equal deleted inserted replaced
15404:deeaffeda047 15405:14f1a1fad65e