Merge branch 'master' into sdl2.0

Browse source

...

This commit is contained in:

Pere Pujal i Carabantes 2021-01-16 00:53:38 +01:00

parent eafa02812e c929224ae5

commit afa562680e

160 changed files with 12539 additions and 9026 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

magic/sounds/pixels.ogg Normal file

View file

Binary file not shown.