diff options
author | trsaunders <trsaunders@gmail.com> | 2012-06-27 17:53:04 +0100 |
---|---|---|
committer | trsaunders <trsaunders@gmail.com> | 2012-06-27 17:53:04 +0100 |
commit | bb69ed37aad36fac6bdf1e2c9669caee5689630f (patch) | |
tree | 781a53c2ba5ffa6b607db156f85bfc8544dcd371 /gui.h | |
parent | bdcbdd4c38b492bba01789ea44d971950ade5864 (diff) | |
download | uGFX-bb69ed37aad36fac6bdf1e2c9669caee5689630f.tar.gz uGFX-bb69ed37aad36fac6bdf1e2c9669caee5689630f.tar.bz2 uGFX-bb69ed37aad36fac6bdf1e2c9669caee5689630f.zip |
fix merge
Diffstat (limited to 'gui.h')
-rw-r--r-- | gui.h | 9 |
1 files changed, 0 insertions, 9 deletions
@@ -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; |