Mercurial > pidgin.yaz
comparison pidgin/pixmaps/protocols/16/myspace.png @ 17319:8a7238fb7905
explicit merge of 'dc4f2ee34039521ae6a198fe7d62f4dca8a84589'
and '9d8bc74c7c13474edcefafedd0af9020b27c9a2f'
author | Jeffrey Connelly <jaconnel@calpoly.edu> |
---|---|
date | Wed, 30 May 2007 02:56:25 +0000 |
parents | f62023eddfc6 |
children | f76246d669c6 |
comparison
equal
deleted
inserted
replaced
16747:496855295bd7 | 17319:8a7238fb7905 |
---|