Mercurial > pidgin.yaz
comparison libpurple/imgstore.h @ 30099:18042a99d213
merge of '466f38a98b4f03139b06e14b4528e0489a2f0bce'
and '919b4430c2e8ef456651ed7a88d4ee34e736c92c'
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Thu, 08 Apr 2010 03:22:01 +0000 |
parents | 2f4b10ee752b |
children | 32e8cdf1833c |
comparison
equal
deleted
inserted
replaced
30095:c2155cf648f9 | 30099:18042a99d213 |
---|