comparison libpurple/eventloop.c @ 17169:9fd39a035729

explicit merge of '61827fc1671b97df72194ee9722ed122cb45c29f' and 'fd6c233ae7838b2c5e1e8a177019a21f91e4a923' to branch 'im.pidgin.pidgin'
author Richard Laager <rlaager@wiktel.com>
date Sat, 19 May 2007 07:52:26 +0000
parents 32c366eeeb99
children f2d8658b3a86
comparison
equal deleted inserted replaced
17161:b40f3d7da1fc 17169:9fd39a035729