diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2017-01-14 19:58:54 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2017-01-14 19:58:54 +0000 |
commit | 9f10babe645fe67b02fae90f852d5e4cdfcbb70e (patch) | |
tree | 909b77e3c48418204a23ac4723684ca0bc76a081 /frontends/atari | |
parent | 0d9023148d2a34bd908aac38e44d449359b03438 (diff) | |
parent | 7dab7cb43d4091648ceb40684ff70aff7091c648 (diff) | |
download | netsurf-9f10babe645fe67b02fae90f852d5e4cdfcbb70e.tar.gz netsurf-9f10babe645fe67b02fae90f852d5e4cdfcbb70e.tar.bz2 |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf into chris/menuclass
Diffstat (limited to 'frontends/atari')
-rw-r--r-- | frontends/atari/plot/font_freetype.c | 2 | ||||
-rw-r--r-- | frontends/atari/plot/font_internal.c | 2 | ||||
-rw-r--r-- | frontends/atari/plot/fontplot.c | 2 | ||||
-rw-r--r-- | frontends/atari/settings.c | 2 | ||||
-rw-r--r-- | frontends/atari/toolbar.c | 1 |
5 files changed, 4 insertions, 5 deletions
diff --git a/frontends/atari/plot/font_freetype.c b/frontends/atari/plot/font_freetype.c index 602820704..8b535e3a3 100644 --- a/frontends/atari/plot/font_freetype.c +++ b/frontends/atari/plot/font_freetype.c @@ -25,7 +25,7 @@ #include "utils/log.h" #include "utils/nsoption.h" #include "netsurf/mouse.h" -#include "desktop/plot_style.h" +#include "netsurf/plot_style.h" #include "atari/gui.h" #include "atari/bitmap.h" diff --git a/frontends/atari/plot/font_internal.c b/frontends/atari/plot/font_internal.c index b96f4c773..6a811e38b 100644 --- a/frontends/atari/plot/font_internal.c +++ b/frontends/atari/plot/font_internal.c @@ -25,7 +25,7 @@ #include "utils/utf8.h" #include "utils/log.h" #include "netsurf/mouse.h" -#include "desktop/plot_style.h" +#include "netsurf/plot_style.h" #include "atari/gui.h" #include "atari/bitmap.h" diff --git a/frontends/atari/plot/fontplot.c b/frontends/atari/plot/fontplot.c index d0a1fe16f..2e02b50b4 100644 --- a/frontends/atari/plot/fontplot.c +++ b/frontends/atari/plot/fontplot.c @@ -22,7 +22,7 @@ #include <mt_gem.h> #include "netsurf/mouse.h" -#include "desktop/plot_style.h" +#include "netsurf/plot_style.h" #include "atari/bitmap.h" #include "atari/plot/fontplot.h" diff --git a/frontends/atari/settings.c b/frontends/atari/settings.c index b6df12760..5759a894a 100644 --- a/frontends/atari/settings.c +++ b/frontends/atari/settings.c @@ -32,7 +32,7 @@ #include "utils/dirent.h" #include "utils/nsoption.h" #include "utils/log.h" -#include "desktop/plot_style.h" +#include "netsurf/plot_style.h" #include "atari/gui.h" #include "atari/res/netsurf.rsh" diff --git a/frontends/atari/toolbar.c b/frontends/atari/toolbar.c index 66bd44b98..9ed87849c 100644 --- a/frontends/atari/toolbar.c +++ b/frontends/atari/toolbar.c @@ -35,7 +35,6 @@ #include "netsurf/mouse.h" #include "netsurf/plotters.h" #include "netsurf/keypress.h" -#include "desktop/plot_style.h" #include "desktop/browser_history.h" #include "desktop/hotlist.h" #include "desktop/textarea.h" |