diff options
| author | Ole Loots <ole@monochrom.net> | 2014-09-12 23:22:26 +0200 |
|---|---|---|
| committer | Ole Loots <ole@monochrom.net> | 2014-09-12 23:22:26 +0200 |
| commit | a9ac9c00fc2c73705db242a459160f14d279cdcd (patch) | |
| tree | 5f9aa630340bad67934e6fdbfda7f239f0fade57 /atari/login.c | |
| parent | 181bc41a9aa200cfac5bf4b84175003639fce488 (diff) | |
| parent | 9e6b0fb8b07cd3147b0a2727d3644860cf7c8c7e (diff) | |
| download | netsurf-a9ac9c00fc2c73705db242a459160f14d279cdcd.tar.gz netsurf-a9ac9c00fc2c73705db242a459160f14d279cdcd.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf
Conflicts:
atari/gui.h
Diffstat (limited to 'atari/login.c')
| -rwxr-xr-x | atari/login.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/atari/login.c b/atari/login.c index 461a2f985..687512ed1 100755 --- a/atari/login.c +++ b/atari/login.c @@ -16,24 +16,22 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "desktop/401login.h" #include <unistd.h> #include <stdlib.h> #include <string.h> #include <stdbool.h> #include <cflib.h> + #include "utils/config.h" #include "content/content.h" #include "content/hlcache.h" #include "content/urldb.h" #include "desktop/browser.h" -#include "desktop/401login.h" #include "desktop/gui.h" #include "utils/errors.h" #include "utils/utils.h" #include "utils/messages.h" #include "utils/log.h" -#include "utils/url.h" #include "content/urldb.h" #include "content/fetch.h" #include "atari/misc.h" |