Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/presence.h @ 22031:9bfdf68d185c
merge of '5fc55e3a78ccb0a463df332592e62c5a371cd8b4'
and 'ca3452eca310a510c6932f9a618b79da824d796a'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Mon, 07 Jan 2008 16:28:25 +0000 |
parents | 481749fc0b6b |
children | 6d6e10476c52 e9b7e41dc816 5767b7698c73 |
comparison
equal
deleted
inserted
replaced
22030:21ed56853648 | 22031:9bfdf68d185c |
---|