Mercurial > pidgin
comparison libpurple/server.c @ 24789:7ba7ba72a5f1
merge of '9643d7374ca3732ca4269075429908a3d1645f4e'
and 'f14f01f8a9d75635cc0532e1e4ad84911c83aa5a'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Wed, 17 Dec 2008 03:03:21 +0000 |
parents | 18858e645788 |
children | 75690a3eeee0 94fa7211eb98 |
comparison
equal
deleted
inserted
replaced
24786:bc9e9463f42c | 24789:7ba7ba72a5f1 |
---|