Mercurial > pidgin.yaz
comparison pidgin/pidginstock.c @ 30944:4b7d599b5a00
merge of '745f55ef98eaf96a452eb54bb2c46f21845f9996'
and 'b04f4322926ab2a4467fb2b9c11d9961e66d1a9c'
author | Marcus Lundblad <ml@update.uu.se> |
---|---|
date | Mon, 09 Nov 2009 19:27:45 +0000 |
parents | 60ab4bdea3c3 |
children | 6e9917e067e6 b1284d63b969 |
comparison
equal
deleted
inserted
replaced
30942:0712ce23901e | 30944:4b7d599b5a00 |
---|