inmarket d362d9603e 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		2013-06-22 23:10:20 +10:00
..
Win32	Merge commit 'd8db148a149541f658cc9729785b3694f80e2624' into GWIN	2013-06-22 23:10:20 +10:00
X	License header updates	2013-06-15 21:09:02 +10:00