Commit 101231b77fdabb3e683d86850486634cb442c836
authorMichel Pollet <buserror@gmail.com>
Wed, 2 Aug 2017 07:52:11 +0000 (08:52 +0100)
committerMichel Pollet <buserror@gmail.com>
Wed, 2 Aug 2017 07:52:11 +0000 (08:52 +0100)
tree670c208a2840d701454a72f1839bb683896d1dbd
parent9a0c479aeedc9c7beb60568e3449c75d7a2f7649
parent9b503521b756cc93d627d0d6ecc934c20387cd32
Message:
Merge branch 'hd44780_not_hd77480' of https://github.com/franciscod/simavr into franciscod-hd44780_not_hd77480

Conflicts:
examples/board_hd44780/font.h
examples/board_hd77480/font.h
examples/parts/hd44780_font.h
2 files changed:
examples/parts/hd44780_glut.c
examples/parts/lcd_font.h