Mercurial > pidgin
diff libpurple/imgstore.c @ 31197:110a62a7d44d
merge of '54f14206293cad5f17a3d9ac3b90a79bbc302d28'
and '76a3cd649cdc469718a2303b59a04263164ec664'
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Mon, 07 Feb 2011 03:17:18 +0000 |
parents | f1437342cc0e |
children |