diff options
author | Joel Bodenmann <joel@unormal.org> | 2014-11-14 16:40:40 +0100 |
---|---|---|
committer | Joel Bodenmann <joel@unormal.org> | 2014-11-14 16:40:40 +0100 |
commit | ebf647b63a69b811b3144aa0740994e1ac073783 (patch) | |
tree | 500d1d7b0a8a01a2a930b497a1af6a022586d8af | |
parent | 4f8b30ef36603d9249f70955328792866474a6bb (diff) | |
parent | 93c9ebaa793d96147784e061102fec3423584fc0 (diff) | |
download | uGFX-ebf647b63a69b811b3144aa0740994e1ac073783.tar.gz uGFX-ebf647b63a69b811b3144aa0740994e1ac073783.tar.bz2 uGFX-ebf647b63a69b811b3144aa0740994e1ac073783.zip |
Merge branch 'master' of https://bitbucket.org/Tectu/ugfx
-rw-r--r-- | demos/readme.txt | 4 | ||||
-rw-r--r-- | demos/tools/touch_driver_test/demo.mk | 3 | ||||
-rw-r--r-- | demos/tools/touch_driver_test/gfxconf.h (renamed from tools/touch_driver_test/gfxconf.h) | 0 | ||||
-rw-r--r-- | demos/tools/touch_driver_test/main.c (renamed from tools/touch_driver_test/main.c) | 0 | ||||
-rw-r--r-- | demos/tools/touch_raw_readings/demo.mk | 3 | ||||
-rw-r--r-- | demos/tools/touch_raw_readings/gfxconf.h (renamed from tools/touch_raw_readings/gfxconf.h) | 0 | ||||
-rw-r--r-- | demos/tools/touch_raw_readings/main.c (renamed from tools/touch_raw_readings/main.c) | 0 | ||||
-rw-r--r-- | demos/tools/uGFXnetDisplay/demo.mk | 3 | ||||
-rw-r--r-- | demos/tools/uGFXnetDisplay/gfxconf.h (renamed from tools/uGFXnetDisplay/gfxconf.h) | 0 | ||||
-rw-r--r-- | demos/tools/uGFXnetDisplay/main.c (renamed from tools/uGFXnetDisplay/main.c) | 0 |
10 files changed, 12 insertions, 1 deletions
diff --git a/demos/readme.txt b/demos/readme.txt index 3530c8e4..a29ce9f6 100644 --- a/demos/readme.txt +++ b/demos/readme.txt @@ -2,7 +2,7 @@ This folder contains a few demos which explain how to use the library. Only the main files are contained. No compile-able projects -All demos and examples stand under the BSD license as declared below and +Most demos and examples stand under the BSD license as declared below and within each file: /* @@ -34,3 +34,5 @@ within each file: */ Files under the 3rdparty directory are licensed as per the original contributor. +Files under the tools directory are licensed with either the uGFX license or the BSD +license - see each tool demo source code for its specific license. diff --git a/demos/tools/touch_driver_test/demo.mk b/demos/tools/touch_driver_test/demo.mk new file mode 100644 index 00000000..3af3fbda --- /dev/null +++ b/demos/tools/touch_driver_test/demo.mk @@ -0,0 +1,3 @@ +DEMODIR = $(GFXLIB)/demos/tools/touch_driver_test +GFXINC += $(DEMODIR) +GFXSRC += $(DEMODIR)/main.c diff --git a/tools/touch_driver_test/gfxconf.h b/demos/tools/touch_driver_test/gfxconf.h index 3d93a138..3d93a138 100644 --- a/tools/touch_driver_test/gfxconf.h +++ b/demos/tools/touch_driver_test/gfxconf.h diff --git a/tools/touch_driver_test/main.c b/demos/tools/touch_driver_test/main.c index 13136a57..13136a57 100644 --- a/tools/touch_driver_test/main.c +++ b/demos/tools/touch_driver_test/main.c diff --git a/demos/tools/touch_raw_readings/demo.mk b/demos/tools/touch_raw_readings/demo.mk new file mode 100644 index 00000000..dbc3746e --- /dev/null +++ b/demos/tools/touch_raw_readings/demo.mk @@ -0,0 +1,3 @@ +DEMODIR = $(GFXLIB)/demos/tools/touch_raw_readings +GFXINC += $(DEMODIR) +GFXSRC += $(DEMODIR)/main.c diff --git a/tools/touch_raw_readings/gfxconf.h b/demos/tools/touch_raw_readings/gfxconf.h index 3d93a138..3d93a138 100644 --- a/tools/touch_raw_readings/gfxconf.h +++ b/demos/tools/touch_raw_readings/gfxconf.h diff --git a/tools/touch_raw_readings/main.c b/demos/tools/touch_raw_readings/main.c index d6c97920..d6c97920 100644 --- a/tools/touch_raw_readings/main.c +++ b/demos/tools/touch_raw_readings/main.c diff --git a/demos/tools/uGFXnetDisplay/demo.mk b/demos/tools/uGFXnetDisplay/demo.mk new file mode 100644 index 00000000..e8bae51e --- /dev/null +++ b/demos/tools/uGFXnetDisplay/demo.mk @@ -0,0 +1,3 @@ +DEMODIR = $(GFXLIB)/demos/tools/uGFXnetDisplay +GFXINC += $(DEMODIR) +GFXSRC += $(DEMODIR)/main.c diff --git a/tools/uGFXnetDisplay/gfxconf.h b/demos/tools/uGFXnetDisplay/gfxconf.h index 4df44bc4..4df44bc4 100644 --- a/tools/uGFXnetDisplay/gfxconf.h +++ b/demos/tools/uGFXnetDisplay/gfxconf.h diff --git a/tools/uGFXnetDisplay/main.c b/demos/tools/uGFXnetDisplay/main.c index 47274a31..47274a31 100644 --- a/tools/uGFXnetDisplay/main.c +++ b/demos/tools/uGFXnetDisplay/main.c |