Patrick 'Quezler' Mounier 39266d23c8 Merge branch 'master' into crater ...

# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites3.png

2020-04-23 21:10:48 +02:00

..

fontgen

[formatting] add newline to file(s) (#1508)

2020-02-05 18:36:56 -05:00

fonts

Added new Cyrillic font

2019-12-15 21:31:55 -05:00

sprites

Merge branch 'master' into crater

2020-04-23 21:10:48 +02:00