Mercurial > pidgin
diff libpurple/protocols/zephyr/ZWait4Not.c @ 22753:3b14215d2ca4
merge of 'a2c4bf662d1fdab8c870c1ebbca30968af4bb80a'
and 'caaa65e1c157e6cb43219237f88a4ad298f3bbf5'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Mon, 28 Apr 2008 06:27:11 +0000 |
parents | 5fe8042783c1 |
children | a8cc50c2279f |