Merge branch 'master' into sdl2.0

Browse source

...

This commit is contained in:

Pere Pujal i Carabantes 2020-10-28 17:03:05 +01:00

parent 41bad90bb6 810d8e0c22

commit 63e060afa3

30 changed files with 6000 additions and 4329 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

BIN

data/images/ui/btn_hold.png Normal file

View file

Binary file not shown.

Side by side After Width:  |  Height:  |  Size: 7.8 KiB