comparison pidgin/gtkdocklet-gtk.c @ 31076:bbf7096ae66c

merge of '598ef461d4de936afef7298e55152cc7ecaa9b70' and 'b4c65c273f2934560d9e643a124b31ac2d2328f2'
author ivan.komarov@soc.pidgin.im
date Wed, 27 Oct 2010 18:26:14 +0000
parents 26c1c5069c28
children 3ed54142386f 7fb5e60fd919
comparison
equal deleted inserted replaced
31074:e7365705f151 31076:bbf7096ae66c