comparison pidgin/gtkconv.h @ 32133:835ea8811734

merge of '3dbc4e50c575de418e1df8f965957b195aeff2ca' and '8e560053e153f10e0b7a2d211f7c20fbe7a2328d'
author Paul Aurich <paul@darkrain42.org>
date Mon, 20 Jun 2011 06:07:38 +0000
parents d1354c10232f
children 67f8717477ea e1cc8d07fe07
comparison
equal deleted inserted replaced
32132:5166e76265ae 32133:835ea8811734