diff options
| author | Ole Loots <ole@monochrom.net> | 2013-01-09 01:33:53 +0100 |
|---|---|---|
| committer | Ole Loots <ole@monochrom.net> | 2013-01-09 01:33:53 +0100 |
| commit | 64f8030b28dfc75052edf8e5131320a5ae8a8801 (patch) | |
| tree | 03fde5205a068fcc8bf9dc8ecf2d7bead3d1f930 /atari/toolbar.h | |
| parent | b96d7afc771caf891a256adc82bd9e8a2dad9b7c (diff) | |
| parent | bfbb4ccbb23b13ad85441ceef24556cf2fd27aa9 (diff) | |
| download | netsurf-64f8030b28dfc75052edf8e5131320a5ae8a8801.tar.gz netsurf-64f8030b28dfc75052edf8e5131320a5ae8a8801.tar.bz2 | |
Merge branch 'master' into mono/removing-windom-dependency
Conflicts:
atari/gui.c
atari/toolbar.h
Diffstat (limited to 'atari/toolbar.h')
| -rw-r--r-- | atari/toolbar.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/atari/toolbar.h b/atari/toolbar.h index d13b59c6b..54a73eece 100644 --- a/atari/toolbar.h +++ b/atari/toolbar.h @@ -17,7 +17,7 @@ struct s_url_widget { /* widget is only redrawn when this flag is set */
bool redraw;
- struct text_area *textarea; + struct textarea *textarea; GRECT rdw_area; GRECT area;
}; |