Mercurial > pidgin
diff libpurple/imgstore.c @ 28624:730ed9c1c780
merge of '569642987f6f11fdb718731b245d60f535fe0962'
and 'c3164aa8a77e2e8f860904f1e7384e8c9f609890'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sun, 22 Nov 2009 23:35:26 +0000 |
parents | 1643ace55ef8 |
children | f1437342cc0e |