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 /riscos/configure/con_secure.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 'riscos/configure/con_secure.c')
| -rw-r--r-- | riscos/configure/con_secure.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/riscos/configure/con_secure.c b/riscos/configure/con_secure.c index 75e2bc705..2e3c31484 100644 --- a/riscos/configure/con_secure.c +++ b/riscos/configure/con_secure.c @@ -17,16 +17,17 @@ */ #include <stdbool.h> + #include "utils/nsoption.h" -#include "riscos/dialog.h" +#include "utils/messages.h" +#include "utils/utils.h" + #include "riscos/gui.h" #include "riscos/wimp.h" #include "riscos/wimp_event.h" #include "riscos/configure.h" #include "riscos/configure/configure.h" -#include "utils/messages.h" -#include "utils/utils.h" - +#include "riscos/dialog.h" #define SECURITY_REFERRER 2 #define SECURITY_DURATION_FIELD 6 |