comparison pidgin/gtkconn.c @ 21146:75ad6af0b02c

merge of '2cecdc50a5092d64d885f3eccee1a6b2209e6651' and 'de413390d6cfd199238da03e9d83b20ac231c258'
author Björn Voigt <bjoern@cs.tu-berlin.de>
date Mon, 05 Nov 2007 20:53:22 +0000
parents b7460582a135
children f3cfcbbac3d8
comparison
equal deleted inserted replaced
21140:226adc219892 21146:75ad6af0b02c