comparison pidgin/gtkconv.c @ 32011:ff88437cffaf

merge of '09b81079c02d3b84a6dedbf29d6ce66862c09a71' and 'c463e6d46ceeceb09d3030a6c1f6360f7e5a6b40'
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Fri, 06 May 2011 06:31:40 +0000
parents 0e7c5fe661e5
children 6b3bc0947068 35395b98f6b5
comparison
equal deleted inserted replaced
31997:a8b4c78f53f0 32011:ff88437cffaf