Merge commit '611e7219673af8445f40ce8c60be87df1b25305e' as 'lcdlib'

diff --cc lcdlib/.gitattributes
index 0000000000000000000000000000000000000000,0ab96b6688cd8ddcfcb920115f82c0e40faa8bae..0ab96b6688cd8ddcfcb920115f82c0e40faa8bae
mode 000000,100644..100644
--- /dev/null
--- 2/.gitattributes
+++ b/lcdlib/.gitattributes

diff --cc lcdlib/.gitignore
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..9fa3b1bf7d165ea6c642bd009bfea0a3aa120a5b
new file mode 100644 (file)
--- /dev/null
--- /dev/null
+++ b/lcdlib/.gitignore
@@@ -1,0 -1,0 +1,18 @@@
++# Object files
++*.o
++*.ko
++
++# Libraries
++*.lib
++*.a
++
++# Shared objects (inc. Windows DLLs)
++*.dll
++*.so
++*.so.*
++*.dylib
++
++# Executables
++*.exe
++*.out
++*.app

diff --cc lcdlib/Fonts/digits_24px.c
index 0000000000000000000000000000000000000000,e0af34c50b28f1bf7e6dea807587e154c2478331..e0af34c50b28f1bf7e6dea807587e154c2478331
mode 000000,100644..100644
--- /dev/null
--- 2/Fonts/digits_24px.c
+++ b/lcdlib/Fonts/digits_24px.c

diff --cc lcdlib/Fonts/digits_24px.font
index 0000000000000000000000000000000000000000,7caee3a9076dea7ad4842bf94d716af1d74d4ea8..7caee3a9076dea7ad4842bf94d716af1d74d4ea8
mode 000000,100644..100644
Binary files differ

diff --cc lcdlib/Fonts/digits_32px.c
index 0000000000000000000000000000000000000000,b7a3d1be606eed5efa979f8d546b4e15677279cd..b7a3d1be606eed5efa979f8d546b4e15677279cd
mode 000000,100644..100644
--- /dev/null
--- 2/Fonts/digits_32px.c
+++ b/lcdlib/Fonts/digits_32px.c

diff --cc lcdlib/Fonts/digits_32px.font
index 0000000000000000000000000000000000000000,20539611e717ee468062aee30108f9890bc44ce9..20539611e717ee468062aee30108f9890bc44ce9
mode 000000,100644..100644
Binary files differ

diff --cc lcdlib/Fonts/font_fixed_16bit.c
index 0000000000000000000000000000000000000000,34b5ce20cb9b801dcc9a3af8d75baeed8e823ba8..34b5ce20cb9b801dcc9a3af8d75baeed8e823ba8
mode 000000,100644..100644
--- /dev/null
--- 2/Fonts/font_fixed_16bit.c
+++ b/lcdlib/Fonts/font_fixed_16bit.c

diff --cc lcdlib/Fonts/font_fixed_16bit.font
index 0000000000000000000000000000000000000000,4f3955a7e20ee9b92ad7005c2b5d3df86b5884d1..4f3955a7e20ee9b92ad7005c2b5d3df86b5884d1
mode 000000,100644..100644
Binary files differ

diff --cc lcdlib/Fonts/font_fixed_8px.c
index 0000000000000000000000000000000000000000,849c7c4183db1b2d5a206a13b2d8fcc9f5d528e0..849c7c4183db1b2d5a206a13b2d8fcc9f5d528e0
mode 000000,100644..100644
--- /dev/null
--- 2/Fonts/font_fixed_8px.c
+++ b/lcdlib/Fonts/font_fixed_8px.c

diff --cc lcdlib/Fonts/font_proportional_16px.c
index 0000000000000000000000000000000000000000,9d574f593d98c2a278e191c3b69b38b7714e7b82..9d574f593d98c2a278e191c3b69b38b7714e7b82
mode 000000,100644..100644
--- /dev/null
--- 2/Fonts/font_proportional_16px.c
+++ b/lcdlib/Fonts/font_proportional_16px.c

diff --cc lcdlib/Fonts/font_proportional_16px.font
index 0000000000000000000000000000000000000000,b6ed3affb397ccf6da4cf5700ca0a6647d662d73..b6ed3affb397ccf6da4cf5700ca0a6647d662d73
mode 000000,100644..100644
Binary files differ

diff --cc lcdlib/Fonts/font_proportional_8px.c
index 0000000000000000000000000000000000000000,0d32ba86459af6adc3beee559d3a98b370a83eb1..0d32ba86459af6adc3beee559d3a98b370a83eb1
mode 000000,100644..100644
--- /dev/null
--- 2/Fonts/font_proportional_8px.c
+++ b/lcdlib/Fonts/font_proportional_8px.c

diff --cc lcdlib/Fonts/font_proportional_8px.font
index 0000000000000000000000000000000000000000,35924605836d34a7ee589318eb7a9d6e9d779b7d..35924605836d34a7ee589318eb7a9d6e9d779b7d
mode 000000,100644..100644
Binary files differ

diff --cc lcdlib/Fonts/symbols_16px.c
index 0000000000000000000000000000000000000000,3ed4bd340c02e2c9990d269630d284f8d0cee3b8..3ed4bd340c02e2c9990d269630d284f8d0cee3b8
mode 000000,100644..100644
--- /dev/null
--- 2/Fonts/symbols_16px.c
+++ b/lcdlib/Fonts/symbols_16px.c

diff --cc lcdlib/Fonts/symbols_16px.font
index 0000000000000000000000000000000000000000,572a60875059da29211099f7b5dc054106c70564..572a60875059da29211099f7b5dc054106c70564
mode 000000,100644..100644
Binary files differ

diff --cc lcdlib/Fonts/symbols_8px.c
index 0000000000000000000000000000000000000000,192113fa2c43c1437316c0988e0f9d391364d9f5..192113fa2c43c1437316c0988e0f9d391364d9f5
mode 000000,100644..100644
--- /dev/null
--- 2/Fonts/symbols_8px.c
+++ b/lcdlib/Fonts/symbols_8px.c

diff --cc lcdlib/Fonts/symbols_8px.font
index 0000000000000000000000000000000000000000,1d3dc6301d8c0076e092071855575747c0c73683..1d3dc6301d8c0076e092071855575747c0c73683
mode 000000,100644..100644
Binary files differ

diff --cc lcdlib/Fonts/template_simplefont.c
index 0000000000000000000000000000000000000000,650d72fa778015f1938e48e74219442729b97a43..650d72fa778015f1938e48e74219442729b97a43
mode 000000,100644..100644
--- /dev/null
--- 2/Fonts/template_simplefont.c
+++ b/lcdlib/Fonts/template_simplefont.c

diff --cc lcdlib/LICENSE
index 0000000000000000000000000000000000000000,ef7e7efc09c9d471c391f05b9567966928085840..ef7e7efc09c9d471c391f05b9567966928085840
mode 000000,100644..100644
--- /dev/null
--- 2/LICENSE
+++ b/lcdlib/LICENSE

diff --cc lcdlib/README.md
index 0000000000000000000000000000000000000000,67adfe1f6a2890208a9c60f10868f4ab986d72da..67adfe1f6a2890208a9c60f10868f4ab986d72da
mode 000000,100644..100644
--- /dev/null
--- 2/README.md
+++ b/lcdlib/README.md

diff --cc lcdlib/dogm-graphic.c
index 0000000000000000000000000000000000000000,acb6962cc38da5bffae87b31c2f8745351506a96..acb6962cc38da5bffae87b31c2f8745351506a96
mode 000000,100644..100644
--- /dev/null
--- 2/dogm-graphic.c
+++ b/lcdlib/dogm-graphic.c

diff --cc lcdlib/dogm-graphic.h
index 0000000000000000000000000000000000000000,a1bb998cede68f555e4645bb7859b47c324d5a80..a1bb998cede68f555e4645bb7859b47c324d5a80
mode 000000,100644..100644
--- /dev/null
--- 2/dogm-graphic.h
+++ b/lcdlib/dogm-graphic.h

diff --cc lcdlib/font.c
index 0000000000000000000000000000000000000000,65006746f83fe362c61c2c3ec44e8bcecf70d939..65006746f83fe362c61c2c3ec44e8bcecf70d939
mode 000000,100644..100644
--- /dev/null
--- 2/font.c
+++ b/lcdlib/font.c

diff --cc lcdlib/font.h
index 0000000000000000000000000000000000000000,4f9d89d2cf2afb108cfc21c13d382852fd2fb423..4f9d89d2cf2afb108cfc21c13d382852fd2fb423
mode 000000,100644..100644
--- /dev/null
--- 2/font.h
+++ b/lcdlib/font.h

diff --cc lcdlib/lcd-color-graphic.c
index 0000000000000000000000000000000000000000,8403f9634afa483853bd868e6a27ffc8dfa5e5d4..8403f9634afa483853bd868e6a27ffc8dfa5e5d4
mode 000000,100644..100644
--- /dev/null
--- 2/lcd-color-graphic.c
+++ b/lcdlib/lcd-color-graphic.c

diff --cc lcdlib/lcd-color-graphic.h
index 0000000000000000000000000000000000000000,41cd6ce8afc9fbb78acc48b259881cee660e9d92..41cd6ce8afc9fbb78acc48b259881cee660e9d92
mode 000000,100644..100644
--- /dev/null
--- 2/lcd-color-graphic.h
+++ b/lcdlib/lcd-color-graphic.h