my 79d2f91ef7 Merge remote-tracking branch 'origin/dev1' into dev1 ...

# Conflicts:
#	src/Block.cpp
#	src/Block.h
#	src/Config.cpp
#	src/Config.h
#	src/DritteFont.cpp

2019-11-19 13:28:04 +01:00

..

Bitmap.cpp

defination of Font and Block interface.

2019-11-14 13:12:48 +01:00

Bitmap.h

defination of Font and Block interface.

2019-11-14 13:12:48 +01:00

Block.cpp

Merge remote-tracking branch 'origin/dev1' into dev1

2019-11-19 13:28:04 +01:00

Block.h

Merge remote-tracking branch 'origin/dev1' into dev1

2019-11-19 13:28:04 +01:00

Config.cpp

Merge remote-tracking branch 'origin/dev1' into dev1

2019-11-19 13:28:04 +01:00

Config.h

Merge remote-tracking branch 'origin/dev1' into dev1

2019-11-19 13:28:04 +01:00

DritteFont.cpp

Merge remote-tracking branch 'origin/dev1' into dev1

2019-11-19 13:28:04 +01:00

Font.cpp

String Umsetzung und DriiteFont finished.

2019-11-19 13:27:18 +01:00

Font.h

String Umsetzung und DriiteFont finished.

2019-11-19 13:27:18 +01:00

TextRenderer.cpp

String Umsetzung und DriiteFont finished.

2019-11-19 13:27:18 +01:00

TextRenderer.h

String Umsetzung und DriiteFont finished.

2019-11-19 13:27:18 +01:00