diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-01-25 18:25:26 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2016-01-25 18:25:26 +0000 |
| commit | 09ac17955ba4e96cef087619eb6b9c61429ea28e (patch) | |
| tree | 90de3ada1ccb435d5463084105e30abfc251f9c4 /amiga/bitmap.c | |
| parent | 8d71c0ae9e48695b14f24a62d3655f11858bba95 (diff) | |
| parent | 6847fad65368bab3418eb716af4f9d485dfe30b1 (diff) | |
| download | netsurf-09ac17955ba4e96cef087619eb6b9c61429ea28e.tar.gz netsurf-09ac17955ba4e96cef087619eb6b9c61429ea28e.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf into chris/fix-palmap-crash
Conflicts:
amiga/bitmap.c
Diffstat (limited to 'amiga/bitmap.c')
| -rw-r--r-- | amiga/bitmap.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/amiga/bitmap.c b/amiga/bitmap.c index c57fb8f20..73cb4e35f 100644 --- a/amiga/bitmap.c +++ b/amiga/bitmap.c @@ -558,7 +558,11 @@ struct BitMap *ami_bitmap_get_native(struct bitmap *bitmap, static nserror bitmap_render(struct bitmap *bitmap, hlcache_handle *content) { +<<<<<<< HEAD // if(ami_plot_screen_is_palettemapped() == true) return NSERROR_OK; +======= + if(ami_plot_screen_is_palettemapped() == true) return NSERROR_OK; +>>>>>>> 6847fad65368bab3418eb716af4f9d485dfe30b1 struct redraw_context ctx = { .interactive = false, |