aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2014-02-19 08:00:52 +1000
committerinmarket <andrewh@inmarket.com.au>2014-02-19 08:00:52 +1000
commitb82448c3e23663a25a423402343fbca78253b80c (patch)
tree57a03e35b88f6e434b6c4d084695fc5ce1061932 /tools
parentdcedf414136e55e6dacbe736babe748e1374e19e (diff)
parent37966ff16d923bbca53c9464815cb49cbd7fc3be (diff)
downloaduGFX-b82448c3e23663a25a423402343fbca78253b80c.tar.gz
uGFX-b82448c3e23663a25a423402343fbca78253b80c.tar.bz2
uGFX-b82448c3e23663a25a423402343fbca78253b80c.zip
Merge branch 'master' into gwin
Diffstat (limited to 'tools')
-rw-r--r--tools/uGFXnetDisplay/main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/uGFXnetDisplay/main.c b/tools/uGFXnetDisplay/main.c
index f16fd213..47274a31 100644
--- a/tools/uGFXnetDisplay/main.c
+++ b/tools/uGFXnetDisplay/main.c
@@ -6,7 +6,7 @@
*/
#include "gfx.h"
-#include "../drivers/multiple/uGFXnet/uGFXnetProtocol.h"
+#include "drivers/multiple/uGFXnet/uGFXnetProtocol.h"
#ifndef GDISP_GFXNET_PORT
#define GDISP_GFXNET_PORT GNETCODE_DEFAULT_PORT