Mercurial > pidgin
comparison libpurple/imgstore.c @ 19114:6de2e9ba0930
merge of '2970edca111b3535ae0703e3c866ad1c3b87df94'
and 'a2b508e8680ac3f20965226a5dd83f7e2a3b15bb'
| author | Eric Polino <aluink@pidgin.im> |
|---|---|
| date | Sun, 24 Jun 2007 02:56:09 +0000 |
| parents | 7df46d8bf114 |
| children | e356256cb8a6 |
comparison
equal
deleted
inserted
replaced
| 19102:7f26e5b98b15 | 19114:6de2e9ba0930 |
|---|---|
| 23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 24 * | 24 * |
| 25 */ | 25 */ |
| 26 | 26 |
| 27 #include <glib.h> | 27 #include <glib.h> |
| 28 #include "internal.h" | |
| 29 | |
| 28 #include "dbus-maybe.h" | 30 #include "dbus-maybe.h" |
| 29 #include "debug.h" | 31 #include "debug.h" |
| 30 #include "imgstore.h" | 32 #include "imgstore.h" |
| 31 #include "util.h" | 33 #include "util.h" |
| 32 | 34 |