diff options
| author | Ole Loots <ole@monochrom.net> | 2013-01-09 23:02:28 +0100 |
|---|---|---|
| committer | Ole Loots <ole@monochrom.net> | 2013-01-09 23:02:28 +0100 |
| commit | 56e1e98e2c50aac42c4e0c66592beba87003a287 (patch) | |
| tree | cd82be0db079bf6356207493650b5172b02893ba /atari | |
| parent | fe49a1833271ef8436f760ff32570fda7f739ed0 (diff) | |
| parent | 6b4ab8141f941474b1b615b19a90d806bccb9ab0 (diff) | |
| download | netsurf-56e1e98e2c50aac42c4e0c66592beba87003a287.tar.gz netsurf-56e1e98e2c50aac42c4e0c66592beba87003a287.tar.bz2 | |
Merge branch 'master' into mono/removing-windom-dependency
Conflicts:
atari/gui.c
Diffstat (limited to 'atari')
| -rwxr-xr-x | atari/gui.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/atari/gui.c b/atari/gui.c index 19ae6505e..fdcd0d4bb 100755 --- a/atari/gui.c +++ b/atari/gui.c @@ -77,7 +77,7 @@ #include "cflib.h"
#define TODO() (0)/*printf("%s Unimplemented!\n", __FUNCTION__)*/
-
+ struct gui_window *input_window = NULL;
struct gui_window *window_list = NULL;
void * h_gem_rsrc;
@@ -986,6 +986,3 @@ int main(int argc, char** argv) return 0;
}
-
-
->>>>>>> master |