From bb69ed37aad36fac6bdf1e2c9669caee5689630f Mon Sep 17 00:00:00 2001 From: trsaunders Date: Wed, 27 Jun 2012 17:53:04 +0100 Subject: [PATCH] fix merge --- gui.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/gui.h b/gui.h index 2a857f17..5b2919f7 100644 --- a/gui.h +++ b/gui.h @@ -6,15 +6,6 @@ #include "glcd.h" #include "touchpad.h" -struct button_t { - uint16_t x0; - uint16_t y0; - uint16_t x1; - uint16_t y1; - uint32_t *state; - uint16_t interval; -}; - static struct guiNode_t { uint8_t type; uint16_t x0;