Mercurial > pidgin
comparison libpurple/imgstore.h @ 21331:6e23ec8b1634
merge of '0f99eebc17d3efab8dac3d72feb857ab25b06cb7'
and 'a179eb8d8fc4c8bc156bdf775c617e04119282da'
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Sun, 11 Nov 2007 18:11:46 +0000 |
parents | f296be2a1039 |
children | 5a85bded9ae8 0ae4d67bd6b1 |
comparison
equal
deleted
inserted
replaced
21327:48c6c89a8158 | 21331:6e23ec8b1634 |
---|