comparison libpurple/core.c @ 21817:c03139b26b77

merge of '9f782ce34a9721fbb634a2c73107820447cc3dc1' and 'c249c7a3d3148046c85b2f023c4ca56b4d60ea2c'
author Luke Schierer <lschiere@pidgin.im>
date Tue, 11 Dec 2007 18:42:26 +0000
parents 38cc722159ff
children 48d09d62912e 02eda4bd2b22
comparison
equal deleted inserted replaced
21816:57765d468458 21817:c03139b26b77