Jan 46a7dcdb48 Merge branch 'develop' into feature/fonticons ...

# Conflicts:
#	src/Components/Loader.cpp
#	src/Components/Modules/Colors.cpp
#	src/Components/Modules/Colors.hpp
#	src/Game/Functions.cpp
#	src/Game/Functions.hpp
#	src/Game/Structs.hpp

2021-09-12 15:09:36 +02:00

..

Functions.cpp

Merge branch 'develop' into feature/fonticons

2021-09-12 15:09:36 +02:00

Functions.hpp

Merge branch 'develop' into feature/fonticons

2021-09-12 15:09:36 +02:00

Structs.hpp

Merge branch 'develop' into feature/fonticons

2021-09-12 15:09:36 +02:00