comparison pidgin/gtkdocklet-x11.c @ 19878:e19a9e7cf15d

merge of '157af56b7d2b30861754d904bd1a501357ee10a7' and 'fc666ac71d6625f3d3433d18f931f602c755d311'
author Gabriel Schulhof <nix@go-nix.ca>
date Fri, 17 Aug 2007 22:50:12 +0000 (2007-08-17)
parents 474283509a2a
children 44b4e8bd759b
comparison
equal deleted inserted replaced
19876:e42b22d0f564 19878:e19a9e7cf15d