From: Jan Michel <jan@mueschelsoft.de>
Date: Wed, 24 Dec 2014 15:14:21 +0000 (+0100)
Subject: Merge commit '1f6fb62f8b2b7dc52e3772fb6e1a90ce21b78901' as 'lcdlib'
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=38f28037642d03f021dc824273f8f41655fc9292;p=avr.git

Merge commit '1f6fb62f8b2b7dc52e3772fb6e1a90ce21b78901' as 'lcdlib'
---

38f28037642d03f021dc824273f8f41655fc9292
diff --cc lcdlib/.gitattributes
index 0000000,0ab96b6..0ab96b6
mode 000000,100644..100644
--- a/lcdlib/.gitattributes
+++ b/lcdlib/.gitattributes
diff --cc lcdlib/.gitignore
index 0000000,9fa3b1b..9fa3b1b
mode 000000,100644..100644
--- a/lcdlib/.gitignore
+++ b/lcdlib/.gitignore
diff --cc lcdlib/Fonts/digits_24px.c
index 0000000,e0af34c..e0af34c
mode 000000,100644..100644
--- a/lcdlib/Fonts/digits_24px.c
+++ b/lcdlib/Fonts/digits_24px.c
diff --cc lcdlib/Fonts/digits_24px.font
index 0000000,7caee3a..7caee3a
mode 000000,100644..100644
Binary files differ
diff --cc lcdlib/Fonts/digits_32px.c
index 0000000,b7a3d1b..b7a3d1b
mode 000000,100644..100644
--- a/lcdlib/Fonts/digits_32px.c
+++ b/lcdlib/Fonts/digits_32px.c
diff --cc lcdlib/Fonts/digits_32px.font
index 0000000,2053961..2053961
mode 000000,100644..100644
Binary files differ
diff --cc lcdlib/Fonts/font_fixed_16bit.c
index 0000000,34b5ce2..34b5ce2
mode 000000,100644..100644
--- a/lcdlib/Fonts/font_fixed_16bit.c
+++ b/lcdlib/Fonts/font_fixed_16bit.c
diff --cc lcdlib/Fonts/font_fixed_16bit.font
index 0000000,4f3955a..4f3955a
mode 000000,100644..100644
Binary files differ
diff --cc lcdlib/Fonts/font_fixed_8px.c
index 0000000,849c7c4..849c7c4
mode 000000,100644..100644
--- a/lcdlib/Fonts/font_fixed_8px.c
+++ b/lcdlib/Fonts/font_fixed_8px.c
diff --cc lcdlib/Fonts/font_proportional_16px.c
index 0000000,9d574f5..9d574f5
mode 000000,100644..100644
--- a/lcdlib/Fonts/font_proportional_16px.c
+++ b/lcdlib/Fonts/font_proportional_16px.c
diff --cc lcdlib/Fonts/font_proportional_16px.font
index 0000000,b6ed3af..b6ed3af
mode 000000,100644..100644
Binary files differ
diff --cc lcdlib/Fonts/font_proportional_8px.c
index 0000000,0d32ba8..0d32ba8
mode 000000,100644..100644
--- a/lcdlib/Fonts/font_proportional_8px.c
+++ b/lcdlib/Fonts/font_proportional_8px.c
diff --cc lcdlib/Fonts/font_proportional_8px.font
index 0000000,3592460..3592460
mode 000000,100644..100644
Binary files differ
diff --cc lcdlib/Fonts/symbols_16px.c
index 0000000,3ed4bd3..3ed4bd3
mode 000000,100644..100644
--- a/lcdlib/Fonts/symbols_16px.c
+++ b/lcdlib/Fonts/symbols_16px.c
diff --cc lcdlib/Fonts/symbols_16px.font
index 0000000,572a608..572a608
mode 000000,100644..100644
Binary files differ
diff --cc lcdlib/Fonts/symbols_8px.c
index 0000000,192113f..192113f
mode 000000,100644..100644
--- a/lcdlib/Fonts/symbols_8px.c
+++ b/lcdlib/Fonts/symbols_8px.c
diff --cc lcdlib/Fonts/symbols_8px.font
index 0000000,1d3dc63..1d3dc63
mode 000000,100644..100644
Binary files differ
diff --cc lcdlib/Fonts/template_simplefont.c
index 0000000,650d72f..650d72f
mode 000000,100644..100644
--- a/lcdlib/Fonts/template_simplefont.c
+++ b/lcdlib/Fonts/template_simplefont.c
diff --cc lcdlib/LICENSE
index 0000000,ef7e7ef..ef7e7ef
mode 000000,100644..100644
--- a/lcdlib/LICENSE
+++ b/lcdlib/LICENSE
diff --cc lcdlib/README.md
index 0000000,67adfe1..67adfe1
mode 000000,100644..100644
--- a/lcdlib/README.md
+++ b/lcdlib/README.md
diff --cc lcdlib/dogm-graphic.c
index 0000000,acb6962..acb6962
mode 000000,100644..100644
--- a/lcdlib/dogm-graphic.c
+++ b/lcdlib/dogm-graphic.c
diff --cc lcdlib/dogm-graphic.h
index 0000000,a1bb998..a1bb998
mode 000000,100644..100644
--- a/lcdlib/dogm-graphic.h
+++ b/lcdlib/dogm-graphic.h
diff --cc lcdlib/font.c
index 0000000,6500674..6500674
mode 000000,100644..100644
--- a/lcdlib/font.c
+++ b/lcdlib/font.c
diff --cc lcdlib/font.h
index 0000000,4f9d89d..4f9d89d
mode 000000,100644..100644
--- a/lcdlib/font.h
+++ b/lcdlib/font.h
diff --cc lcdlib/lcd-color-graphic.c
index 0000000,8403f96..8403f96
mode 000000,100644..100644
--- a/lcdlib/lcd-color-graphic.c
+++ b/lcdlib/lcd-color-graphic.c
diff --cc lcdlib/lcd-color-graphic.h
index 0000000,41cd6ce..41cd6ce
mode 000000,100644..100644
--- a/lcdlib/lcd-color-graphic.h
+++ b/lcdlib/lcd-color-graphic.h