fix merge

ugfx_release_2.6
trsaunders 2012-06-27 17:53:04 +01:00
parent bdcbdd4c38
commit bb69ed37aa
1 changed files with 0 additions and 9 deletions

9
gui.h
View File

@ -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;