aboutsummaryrefslogtreecommitdiffstats
path: root/demos/applications
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2013-06-22 23:10:20 +1000
committerinmarket <andrewh@inmarket.com.au>2013-06-22 23:10:20 +1000
commitd362d9603e9d161e7006282f882205754e5afc58 (patch)
tree65b9dc2b61ba842234c364ab9ec086276e08cedb /demos/applications
parenta7c61175508396889bb9304fd47b830938d39691 (diff)
parentd8db148a149541f658cc9729785b3694f80e2624 (diff)
downloaduGFX-d362d9603e9d161e7006282f882205754e5afc58.tar.gz
uGFX-d362d9603e9d161e7006282f882205754e5afc58.tar.bz2
uGFX-d362d9603e9d161e7006282f882205754e5afc58.zip
Merge commit 'd8db148a149541f658cc9729785b3694f80e2624' into GWIN
Conflicts: demos/applications/mandelbrot/gfxconf.h demos/applications/mandelbrot/main.c demos/applications/notepad/gfxconf.h demos/applications/notepad/main.c demos/benchmarks/gfxconf.h demos/benchmarks/main.c demos/modules/gadc/gfxconf.h demos/modules/gadc/gwinosc.c demos/modules/gadc/gwinosc.h demos/modules/gadc/main.c demos/modules/gaudin/gfxconf.h demos/modules/gaudin/gwinosc.c demos/modules/gaudin/gwinosc.h demos/modules/gaudin/main.c demos/modules/gdisp/gdisp_basics/gfxconf.h demos/modules/gdisp/gdisp_basics/main.c demos/modules/gdisp/gdisp_circles/gfxconf.h demos/modules/gdisp/gdisp_circles/main.c demos/modules/gdisp/gdisp_images/gfxconf.h demos/modules/gdisp/gdisp_images/main.c demos/modules/gdisp/gdisp_images_animated/gfxconf.h demos/modules/gdisp/gdisp_images_animated/main.c demos/modules/gdisp/gdisp_text/gfxconf.h demos/modules/gdisp/gdisp_text/main.c demos/modules/ginput/touch_driver_test/gfxconf.h demos/modules/ginput/touch_driver_test/main.c demos/modules/graph/gfxconf.h demos/modules/graph/main.c demos/modules/gtimer/gfxconf.h demos/modules/gtimer/main.c demos/modules/gwin/basic/gfxconf.h demos/modules/gwin/basic/main.c demos/modules/gwin/console/gfxconf.h demos/modules/gwin/console/main.c demos/modules/gwin/slider/gfxconf.h demos/modules/gwin/slider/main.c demos/modules/tdisp/gfxconf.h demos/modules/tdisp/main.c drivers/gdisp/ILI9320/gdisp_lld_config.h drivers/gdisp/ILI9325/gdisp_lld_config.h drivers/gdisp/Nokia6610GE12/GE12.h drivers/gdisp/Nokia6610GE12/gdisp_lld_board_example.h drivers/gdisp/Nokia6610GE12/gdisp_lld_board_olimexsam7ex256.h drivers/gdisp/Nokia6610GE12/gdisp_lld_config.h drivers/gdisp/Nokia6610GE8/GE8.h drivers/gdisp/Nokia6610GE8/gdisp_lld_board_example.h drivers/gdisp/Nokia6610GE8/gdisp_lld_config.h drivers/gdisp/S6D1121/gdisp_lld_board_example.h drivers/gdisp/S6D1121/gdisp_lld_board_olimex_e407.h drivers/gdisp/S6D1121/gdisp_lld_config.h drivers/gdisp/SSD1289/gdisp_lld_board_example.h drivers/gdisp/SSD1289/gdisp_lld_board_firebullstm32f103.h drivers/gdisp/SSD1289/gdisp_lld_config.h drivers/gdisp/SSD1963/gdisp_lld_board_example_gpio.h drivers/gdisp/TestStub/gdisp_lld_config.h drivers/ginput/toggle/Pal/ginput_lld_toggle_board_example.h drivers/ginput/toggle/Pal/ginput_lld_toggle_config.h drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_example.h drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_firebull_stm32f103.h drivers/ginput/touch/ADS7843/ginput_lld_mouse_board_olimex_stm32_e407.h drivers/ginput/touch/MCU/ginput_lld_mouse_board_example.h drivers/ginput/touch/MCU/ginput_lld_mouse_board_olimex_pic32mx_lcd.h drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_embest_dmstf4bb.h drivers/ginput/touch/STMPE811/ginput_lld_mouse_board_example.h drivers/multiple/Win32/gdisp_lld_config.h drivers/multiple/Win32/ginput_lld_toggle_config.h include/gaudin/options.h include/gaudout/options.h include/ginput/options.h include/gtimer/options.h include/gwin/internal.h license.html
Diffstat (limited to 'demos/applications')
-rw-r--r--demos/applications/mandelbrot/gfxconf.h1
-rw-r--r--demos/applications/mandelbrot/main.c1
-rw-r--r--demos/applications/notepad/gfxconf.h1
-rw-r--r--demos/applications/notepad/main.c1
4 files changed, 4 insertions, 0 deletions
diff --git a/demos/applications/mandelbrot/gfxconf.h b/demos/applications/mandelbrot/gfxconf.h
index 1fb8e8c3..c2c56714 100644
--- a/demos/applications/mandelbrot/gfxconf.h
+++ b/demos/applications/mandelbrot/gfxconf.h
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
* Copyright (c) 2012, 2013, Andrew Hannam aka inmarket
+ *
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/demos/applications/mandelbrot/main.c b/demos/applications/mandelbrot/main.c
index ce738fed..37e0ac5f 100644
--- a/demos/applications/mandelbrot/main.c
+++ b/demos/applications/mandelbrot/main.c
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
* Copyright (c) 2012, 2013, Andrew Hannam aka inmarket
+ *
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/demos/applications/notepad/gfxconf.h b/demos/applications/notepad/gfxconf.h
index e65d4f45..6755d30d 100644
--- a/demos/applications/notepad/gfxconf.h
+++ b/demos/applications/notepad/gfxconf.h
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
* Copyright (c) 2012, 2013, Andrew Hannam aka inmarket
+ *
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
diff --git a/demos/applications/notepad/main.c b/demos/applications/notepad/main.c
index 3da0fec1..261b09d4 100644
--- a/demos/applications/notepad/main.c
+++ b/demos/applications/notepad/main.c
@@ -1,6 +1,7 @@
/*
* Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
* Copyright (c) 2012, 2013, Andrew Hannam aka inmarket
+ *
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without