diff pidgin/gtkconvwin.h @ 30751:e9fbbfe1ab70

merge of '5b9ae21a0927d9a160964bfb1cad7a43253fba0d' and '874c07e0346e899fe81f0ecd50471f478e1161c9'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 31 Jul 2010 23:43:37 +0000
parents 5f80ccce8003
children ae24e54a5014 4f445c48581a
line wrap: on
line diff