Mercurial > pidgin.yaz
comparison libpurple/roomlist.c @ 30142:2e0dffa155db
merge of '0a2b3d194869ba6d7da504c295d74e41e6a38633'
and '81475e0c8a58feff71c5b6f773bb62f7a059fb73'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Thu, 15 Apr 2010 00:49:01 +0000 |
parents | f1437342cc0e |
children | 5dafa68c8eb0 |
comparison
equal
deleted
inserted
replaced
30141:36379bf98ed6 | 30142:2e0dffa155db |
---|