Mercurial > pidgin.yaz
comparison libpurple/protocols/zephyr/ZWait4Not.c @ 26728:d06af7664a7a
merge of '6a70c2c1325aeb644bff8476f94c5a25f83044fb'
and 'd5a487de6cafd4f773a3cc1b9b08d6081771e9de'
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Wed, 22 Apr 2009 18:37:31 +0000 |
parents | 5fe8042783c1 |
children | a8cc50c2279f |
comparison
equal
deleted
inserted
replaced
26716:474a0cb44f58 | 26728:d06af7664a7a |
---|