diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-11-19 21:12:31 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-11-19 21:12:31 +0000 |
| commit | 4f0c9b6c610d1eb9a5bcccf6dbf3f53410df9432 (patch) | |
| tree | 2b7be1c59b057b4c3dbc763291c5ad63ec7f3828 /content/fetchers/data.c | |
| parent | 2c6f2f4ef5a50c36676308f6663c0d21edc6aa70 (diff) | |
| parent | faf4c1fb6012941134046db14370f60748184b05 (diff) | |
| download | netsurf-4f0c9b6c610d1eb9a5bcccf6dbf3f53410df9432.tar.gz netsurf-4f0c9b6c610d1eb9a5bcccf6dbf3f53410df9432.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf into chris/malloc
Conflicts:
frontends/amiga/icon.c
Diffstat (limited to 'content/fetchers/data.c')
| -rw-r--r-- | content/fetchers/data.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/content/fetchers/data.c b/content/fetchers/data.c index d82832a31..139d09aea 100644 --- a/content/fetchers/data.c +++ b/content/fetchers/data.c @@ -25,6 +25,7 @@ #include <string.h> #include <stdlib.h> #include <libwapcaplet/libwapcaplet.h> +#include <nsutils/base64.h> #include "utils/url.h" #include "utils/nsurl.h" @@ -32,7 +33,6 @@ #include "utils/log.h" #include "utils/utils.h" #include "utils/ring.h" -#include "nsutils/base64.h" #include "content/fetch.h" #include "content/fetchers.h" |