Mercurial > pidgin
comparison libpurple/imgstore.c @ 29345:13fa0fffac6d
merge of '1529fa495883d559527375c0d8b7fbe68cf019c2'
and '3e607deb45a1ba0c62a1b8f376d94b2751ec8343'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 09 Jan 2010 02:00:18 +0000 |
| parents | f1437342cc0e |
| children |
comparison
equal
deleted
inserted
replaced
| 29321:c4ed54041d6e | 29345:13fa0fffac6d |
|---|---|
| 23 * along with this program; if not, write to the Free Software | 23 * along with this program; if not, write to the Free Software |
| 24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA | 24 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
| 25 * | 25 * |
| 26 */ | 26 */ |
| 27 | 27 |
| 28 #include <glib.h> | |
| 29 #include "internal.h" | 28 #include "internal.h" |
| 30 | 29 |
| 31 #include "dbus-maybe.h" | 30 #include "dbus-maybe.h" |
| 32 #include "debug.h" | 31 #include "debug.h" |
| 33 #include "imgstore.h" | 32 #include "imgstore.h" |