Joel Bodenmann
52c1edc5ab
Improve GWIN widget demo layouting
2014-05-11 16:07:21 +02:00
Joel Bodenmann
e8f0f8faa8
Improving look of GWIN widget demo
2014-05-11 16:01:50 +02:00
Joel Bodenmann
5025772260
Extending GWIN widget demo
2014-05-11 15:11:10 +02:00
Joel Bodenmann
9e6b210425
simplify gwin widgets demo code
2014-05-11 13:59:48 +02:00
inmarket
a25c56f8ed
More freeflowing of the widgets demo for smaller displays.
2014-05-11 20:26:17 +10:00
inmarket
0219daa6eb
Update widgets demo to use Containers.
...
Reflow the controls so they display better on smaller displays.
2014-05-11 20:12:16 +10:00
inmarket
95a3570c88
Remove NULLs except in comments as some compilers/OS's give strange definitions.
2014-05-11 13:10:50 +10:00
inmarket
bdbe78a8da
frame fixes
2014-05-11 13:09:36 +10:00
Joel Bodenmann
2364f21333
GWIN frame demo - compiling but crashing
2014-05-10 13:26:13 +02:00
inmarket
9e8b38ba94
Add gwinClearInit() and gwinWidgetClearInit() to clear gwin initialisation structures.
...
Incorporate into demo's
2014-05-09 21:25:31 +10:00
Joel Bodenmann
81517afc37
Imagebox widget demo compiler warning fix
2014-05-09 10:39:27 +02:00
Joel Bodenmann
5979acc7f6
Introducing GWIN_PROGRESSBAR_AUTO for the automatic incremental function of the progressbar widget
2014-05-08 14:37:13 +02:00
inmarket
df4d275183
Updates to the widgets demo:
...
- Convert the image to a gif so it is smaller and has a transparent background
- Move opening the mouse to the beginning to stop calibration flashing the screen (ugly)
- Clean up extra defines in gfxconf.h - Conflicts with some drivers.
2014-05-01 16:42:35 +10:00
inmarket
5ada56e807
Fix list label in widget demo
2014-05-01 13:52:26 +10:00
Joel Bodenmann
3ca8a99c7e
Adding gwin/label demo
2014-04-28 23:22:09 +02:00
Joel Bodenmann
8b4ca72036
Added gwinListEnableRender()
2014-04-26 03:27:19 +02:00
Joel Bodenmann
af3dae4f42
Fixing gwin demo
2014-04-26 03:07:31 +02:00
Joel Bodenmann
b7a34ad91b
Updated gwin/widgets demo. Does now no longer use ChibiOS/RT logo
2014-04-24 03:44:29 +02:00
Joel Bodenmann
063ed86075
Adding gwin/imagebox demo
2014-04-24 03:33:53 +02:00
Joel Bodenmann
a34c0ded18
Updating progressbar demo
2014-04-23 23:56:22 +02:00
Joel Bodenmann
adff1a0c03
Updated progressbar demo
2014-04-23 23:43:54 +02:00
Joel Bodenmann
1fc155b6b0
Fixed progressbar in widgets demo
2014-04-23 23:41:50 +02:00
Joel Bodenmann
d15d3ee19b
Added progressbar
2014-04-23 23:06:28 +02:00
Joel Bodenmann
0b08bb40ed
Added smooth scrolling list to GWIN demo
2014-04-23 03:03:36 +02:00
Joel Bodenmann
9f35f0de7c
whitespaces - widgets demo
2014-04-23 02:58:49 +02:00
Joel Bodenmann
414d3ea0b8
fixing demo gfxconf.h
2014-04-23 02:29:57 +02:00
inmarket
cd5abc421d
Update audio play demo to play in a loop (easier for testing)
2014-03-30 19:07:17 +10:00
inmarket
343ddd7158
Final updates to GADC recording after fixing bugs in the ChibiOS AT91SAM7X ADC driver
2014-03-24 16:49:17 +10:00
inmarket
9919aeac89
Bug fixes and comments in audio recording demo
2014-03-24 10:08:51 +10:00
inmarket
c354639f7b
Update GADC
2014-03-24 10:08:15 +10:00
inmarket
271f0c743f
Updates to GADC to use new simpler gfx queued bufferring.
...
NOTE: code is still buggy (or the one and only driver is buggy).
2014-03-20 23:41:27 +10:00
inmarket
8b9d31ef90
Move queued buffer code from gaudio into gqueue
2014-03-20 23:33:32 +10:00
inmarket
e4d6884bca
Cause the gaudio/gadc driver (currently broken) to include the GADC framework if it is included in the make.
2014-03-20 23:31:10 +10:00
inmarket
ea5a1b849d
Combine GAUDIN and GAUDOUT into a single GAUDIO module.
...
Simplify GAUDIN (now GAUDIO RECORD) api.
Update audio demo's to match.
Port Win32 driver to new audio api.
2014-03-11 17:13:31 +10:00
inmarket
6d5a748f1c
First GAUDOUT working demo.
2014-03-06 20:02:16 +10:00
inmarket
47cfa8d152
Fix incorrect additon of GFX flag on audio in oscilloscope demo
2014-03-06 20:01:03 +10:00
inmarket
2fb6697f2a
Move gaudin oscilloscope demo to a new directory
2014-03-06 19:58:13 +10:00
inmarket
ccf05de456
Update console demo to test more console features.
2014-03-05 13:42:41 +10:00
inmarket
c110548507
Add support for ANSI like escape sequences to control display color and attributes in a GWIN console.
...
Updated the console demo to demonstrate this.
2014-03-04 14:14:15 +10:00
inmarket
37966ff16d
Integrate the include files with each module. Simplifies structure of code.
2014-02-19 00:36:52 +10:00
inmarket
fe6708c7a2
Demo updates to fix compile issues.
2014-02-19 00:23:07 +10:00
inmarket
6dd606fc2f
Add demo makefiles and update example master makefiles to match.
2014-02-19 00:19:38 +10:00
inmarket
200f7ecf6d
Updates to demo to work on ChibiOS and to test orientation.
2014-02-16 17:22:24 +10:00
inmarket
5edf7c956e
On ARM gcc compiler it appears that non-referenced character arrays are "optimised" out (but not on x86).
...
This conflicts with the -b parameter in the file2c tool and leads to corrupted images on ARM platforms.
For now just remove the parameter when generating ROMFS files for an ARM platform.
2014-02-15 22:28:07 +10:00
inmarket
4d3a08f5cf
Update image demo's to use GFILE ROMFS.
2014-02-07 18:44:32 +10:00
inmarket
010e0f0d62
Update demo's with images in them
2014-02-07 14:08:39 +10:00
inmarket
71818b2942
Listbox demo: Change default font to UI2, fix the gfxconf defines, remove surpurflous defines
2014-02-03 17:57:38 +10:00
Joel Bodenmann
6515373b2a
removing casts of gfxAlloc() return value as that is the whole idea behind having a void pointer
2014-02-02 12:59:36 +01:00
Joel Bodenmann
55ced68fbd
list demo & doc
2014-02-01 15:38:37 +01:00
inmarket
199b89e4dc
Updates to console history. This now works well.
2014-01-17 18:36:28 +10:00
inmarket
301f871ee7
Update GAUDIN and GADC demos to new internal GWIN structures.
...
Also add support for signed sample formats.
2013-12-22 21:37:41 +10:00
inmarket
d9f02858fd
Replace NULL's with 0 as NULL is not defined by the Raw32 GOS.
2013-12-21 13:21:59 +10:00
Joel Bodenmann
891f134bc1
Removed TDISP module
2013-12-11 14:50:09 +01:00
Joel Bodenmann
560f946cd9
Added progressbar widget (demos still to do)
2013-12-01 23:53:42 +01:00
inmarket
51dedb56d1
Move touch driver test to tools.
...
Also replace gwin buttons as they comptete with the test for touch events
2013-11-23 12:57:49 +10:00
inmarket
1dfbc0ab82
Comment fix
2013-11-23 12:55:23 +10:00
inmarket
db74e7c823
Remove orientation changes in demos because this is now handled by using GDISP_DEFAULT_ORIENTATION.
2013-11-16 01:51:32 +10:00
inmarket
1f99d5c9fa
Add support for a default application orientation.
...
Also remove old unneeded GDISP_USE_CUSTOM_BOARD macro
2013-11-09 19:18:59 +10:00
inmarket
53408e2cb3
Fix incorrect naming of GMISC_INVSQRT_... macros.
2013-11-09 19:13:01 +10:00
inmarket
553dea5fcd
Make the hardware depedant options clearer for the widgets demo
2013-10-29 01:11:25 +10:00
inmarket
db09e33dff
Fix spelling error and migrate demo gfxconf.h changes to all demos including the new streaming and multiple display demos
2013-10-28 10:46:25 +10:00
Joel Bodenmann
2cb8e08c52
uncommented GOS selection in GDISP and GWIN demos
2013-10-28 10:00:35 +10:00
Joel Bodenmann
36c55722dd
updated GDISP and GWIN demos
2013-10-28 09:52:09 +10:00
Joel Bodenmann
2832f97fed
fixed orientation stuff in widgets demo
2013-10-26 17:58:25 +02:00
inmarket
7ba622b797
Add initial orientation to the widgets demo.
2013-10-24 16:52:17 +10:00
inmarket
e6f17baf61
GMISC invsqrt() function.
...
Fix a 64bit processor bug.
Add support for processors where the floating point and integer endianness don't match.
Add support for processors with a non-standard floating point format.
Update gdisp_streaming demo with extra comments to reflect the above changes.
2013-10-24 15:03:47 +10:00
inmarket
70b8206356
Update graph demo so it compiles multi-os direct from a makefile
2013-10-22 09:17:41 +10:00
inmarket
0b9db701a1
Fix missing case in gdispStreamStop().
...
Add support for controllers that need flushing.
Add both automatic and manual flushing (via the gdispFlush() method)
2013-10-21 13:34:55 +10:00
inmarket
86a5734912
Multiple controller support can now auto-detect hardware capabilities at run-time.
...
Specific hardware support can still be turned off or on via macros in gfxconf.h to improve efficiency.
Multiple Display demo updated to match.
2013-10-16 01:39:56 +10:00
inmarket
3b8c572552
New demo for multiple display support.
2013-10-14 08:55:44 +10:00
inmarket
a7360c13c2
Update animated image demo to better support small displays
2013-09-27 01:36:31 +10:00
inmarket
c5ceb31e73
Update to streaming demo program to only update the needed area (results in much faster display on slow devices)
...
Also now demonstrates streaming to a non-full screen area.
2013-09-25 17:15:50 +10:00
inmarket
f16d80e099
New streaming demo
2013-09-24 16:12:03 +10:00
inmarket
85aa1f03ed
Use scrolling console in widget demo by default
2013-09-18 23:40:17 +10:00
inmarket
6858e33285
Update demos so OS can be specified in the Makefile
2013-09-18 23:38:26 +10:00
Joel Bodenmann
a7fecd2a0b
added cyrillic font demo
2013-09-15 02:34:07 +02:00
inmarket
b53ab7adf4
Update demos slightly.
2013-09-06 12:22:08 +10:00
inmarket
bbdbd637f0
Update old demos for new fonts.
2013-08-17 23:35:18 +10:00
inmarket
0e707769b4
Add new font demo showing how to include user application fonts.
2013-08-17 23:34:43 +10:00
inmarket
9ebd3530fa
Merge branch 'master' into fonts
2013-08-01 18:13:59 +10:00
inmarket
ac2baed7e5
Update widget demo so list 3 is multi-select
2013-08-01 18:12:58 +10:00
inmarket
a2632f0d31
Merge branch 'master' into fonts
2013-08-01 18:07:34 +10:00
inmarket
2e91479bd5
Add image support to GWIN Listboxes.
...
Updated GWIN widgets demo to match.
2013-08-01 18:05:48 +10:00
inmarket
312e759124
Add GWIN List multi-select support
2013-08-01 15:58:46 +10:00
inmarket
157ec08034
Merge branch 'master' into fonts
2013-08-01 15:06:32 +10:00
inmarket
2d27673f0f
Update GWIN widget demo
2013-08-01 14:51:40 +10:00
inmarket
06d339456e
Update gwin widgets and lists demos
2013-08-01 14:50:40 +10:00
inmarket
3ac4e9e789
Update widgets demo for new fonts
2013-07-29 16:21:36 +10:00
inmarket
984e14efb7
List updates and add list demo - still work in progress
2013-07-27 22:26:16 +10:00
inmarket
1fbbc4d52b
Integrate changes from master branch
2013-07-27 22:25:20 +10:00
inmarket
65ac315271
Remove preset GOS choice. It is defaulted if not specified anyway.
2013-07-26 12:56:27 +10:00
inmarket
7961241989
Fix corruption of binary files by license header updates
2013-07-22 17:04:37 +10:00
Joel Bodenmann
73c5ef26f8
fixed license headers
2013-07-21 22:20:37 +02:00
inmarket
386539072c
Image animation changes
2013-07-19 09:37:50 +10:00
Joel Bodenmann
bd8620fb93
typo
2013-07-17 17:50:57 +02:00
Joel Bodenmann
d900257ded
added slider demo
2013-07-17 01:48:42 +02:00
Joel Bodenmann
cd5c0e32c1
added radio button demo code
2013-07-16 19:46:31 +02:00
Joel Bodenmann
20155b84c4
whitespaces
2013-07-16 19:00:26 +02:00
Joel Bodenmann
30feefb728
added checkbox demo
2013-07-16 18:57:12 +02:00
Joel Bodenmann
7944147301
added button demo
2013-07-16 18:50:17 +02:00
inmarket
83897ac07a
Update graph demo and move under gwin demos
2013-07-16 15:29:26 +10:00
inmarket
c82fc68bfa
Update gaudin and gadc demos for new GWIN
2013-07-16 15:28:42 +10:00
inmarket
3d8bb4e85e
Add image into Widget demo
2013-07-07 20:10:00 +10:00
inmarket
ba264ef1ad
Update GWIN demos
2013-07-07 19:43:34 +10:00
inmarket
8681e85ba6
Change GDISP image default reading mode for WIN32
2013-07-07 19:43:03 +10:00
inmarket
74035c5b2e
Add missing file to GDISP image demo
2013-07-07 19:42:22 +10:00
inmarket
fb131f8d26
Remove Slider demo. It is replaced by the Wdigets demo
2013-07-07 19:41:15 +10:00
Joel Bodenmann
f2432096cd
added GWIN image demo
2013-07-06 14:24:40 +02:00
inmarket
5191c278e7
Add Radio buttons (can also be used as a Tab group)
2013-07-06 01:46:34 +10:00
inmarket
21e52bc859
Math library no longer needed on widget demo
2013-07-04 00:53:41 +10:00
inmarket
dce9dc00a8
Widget demo update
2013-07-04 00:22:15 +10:00
Joel Bodenmann
b8b149591f
readme fix
2013-07-01 09:10:47 +02:00
Joel Bodenmann
775c05f301
in /demos/modules/gwin/widgets disabled ginput toggle by default
2013-07-01 09:09:44 +02:00
inmarket
8ed9e763c0
GWIN reduce Initialisation parameters and fix visibility issues
2013-06-24 22:58:37 +10:00
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
inmarket
ed0bac9765
License header updates
2013-06-15 21:37:22 +10:00
inmarket
49b3e8f55a
License header updates
2013-06-15 21:09:02 +10:00
inmarket
2cb35d6815
Clean up GWIN Event assignment. Optimise event efficiency.
2013-06-10 17:18:01 +10:00
inmarket
777ec6af7c
Add a simple GWIN window manager, Change the way GWIN visibility works
2013-06-08 02:27:59 +10:00
inmarket
0dca00fc21
License header fixes to some demos.
2013-06-06 16:52:41 +10:00
inmarket
663caba662
GWIN fixes
2013-06-06 16:48:30 +10:00
inmarket
1db77bda85
License fixes to some demos
2013-06-06 16:47:57 +10:00
inmarket
7baf5c5d44
New simplified gwin using a pseudo class structure.
2013-06-06 14:33:32 +10:00
inmarket
c2a4f9a5d6
Had extra elements to gitignore and fix image problems created by github
2013-06-02 18:55:59 +10:00
Joel Bodenmann
f2ba60f465
gdispInit() -> gfxInit() in all demos
2013-05-30 19:02:55 +02:00
inmarket
7fbfde42aa
GOS module, for operating system independance
...
GMISC fast floating point trig
GMISC fast fixed point trig
2013-05-25 01:26:52 +10:00
Joel Bodenmann
3571d18741
TDISP demo fix
2013-05-15 18:05:25 +02:00
Joel Bodenmann
296e74f3e0
Revert "updated license headers"
...
This reverts commit 0a26d9983b
.
2013-05-02 01:53:28 +02:00
Joel Bodenmann
0a26d9983b
updated license headers
2013-05-02 01:50:09 +02:00
Andrew Hannam
a02c124940
GIF image handling
...
GIF image handling
Updates to Image structure to make memory accounting optional
Add set image background color to handle animated transparency.
2013-04-20 21:19:26 +10:00
Joel Bodenmann
1946749578
changed the license of all demos to BSD
2013-04-08 21:55:13 +02:00
Andrew Hannam
9ee7c284e6
Add GINPUT Dial, simplify GWIN input assignment
...
Added GINPUT Dial support and a driver that uses GADC to read the dial.
Added support for Dial inputs to the GWIN slider.
Updated the slider demo for Dial Inputs.
Simplified the assigning of inputs to GWIN "widgets" button and slider.
Updated the demo's to match the new input to button assignment.
2013-04-07 16:02:10 +10:00
Andrew Hannam
ee19104dbb
GWIN slider + image support
2013-04-06 21:54:19 +10:00
Andrew Hannam
a67cafeaa7
Move demos to better locations
2013-04-06 21:53:40 +10:00
Andrew Hannam
8b15aab802
Update demo to use Memory Reader for images
2013-04-04 21:02:05 +10:00
Andrew Hannam
64971549fd
New GDISP image handling with demo
...
Images currently support Native and BMP (except RLE4,8 and 16 bit - due
to bugs)
Supports reading from Memory, BaseFileStream or real files (only on the
Win32 simulator).
Move gdisp_pictures demo to better refect its purpose.
Bug fixes for BMP RLE4,8 & 16 bit to come very soon
GIF support very soon.
2013-04-03 13:51:43 +10:00
Andrew Hannam
40b390908c
GDISP changes including polygon support
...
Add polygon drawing
Add convex polygon filling
Start support for a monochrome display
Move gdisp doxygen to header file
Restructure the balance between gdisp.h and gdisp_lld.h
Remove old extern font definitions (now always use gdispOpenFont)
Make public the GDISP structure and change macros to suit (faster for
the application).
gdispQuery is now optional.
2013-03-10 16:14:32 +10:00
Andrew Hannam
8a40457c86
Revert "GDISP changes including polygon support"
...
This reverts commit 269262ef9b
.
2013-03-10 16:12:13 +10:00
Andrew Hannam
269262ef9b
GDISP changes including polygon support
...
Add polygon drawing
Add convex polygon filling
Start support for a monochrome display
Move gdisp doxygen to header file
Restructure the balance between gdisp.h and gdisp_lld.h
Remove old extern font definitions (now always use gdispOpenFont)
Make public the GDISP structure and change macros to suit (faster for
the application).
gdispQuery is now optional.
2013-03-10 16:11:41 +10:00
Andrew Hannam
40534cbc79
Correction of copyright message
2013-03-08 00:49:52 +10:00
Joel Bodenmann
e315480c71
updated copyright - 2013
2013-03-06 23:11:01 +01:00
Joel Bodenmann
12a6eeb91d
added gdisp_pictures demo
2013-03-04 23:54:50 +01:00
Joel Bodenmann
b91e619573
__inline becomes inline because most compilers dont like the prefix
2013-03-04 23:50:21 +01:00
Andrew Hannam
6ee8b005ae
GAUDIN implemented with GADC driver
2013-03-01 09:04:52 +10:00
Andrew Hannam
9bec5967b2
GADC implementation with demo program
...
Also includes driver for AT91SAM7 cpu
2013-02-18 17:33:35 +10:00
Joel Bodenmann
1bfc5a9f85
removed GDISP_LLD() macro - fix
2013-02-11 09:25:45 +01:00
Joel Bodenmann
885b3d53b3
removed GDISP_LLD() macro
2013-02-11 09:25:26 +01:00
Joel Bodenmann
1e4cb14188
TDISP update
2013-01-16 10:29:03 +01:00
Joel Bodenmann
1c1b3c8d74
TDISP: added custom character routine
2013-01-12 09:38:38 +01:00
Joel Bodenmann
66bb4ecb85
Merge branch 'tdisp'
2013-01-11 15:04:40 +01:00