Merge branch 'master' into sdl2.0

Browse source

...

This commit is contained in:

Pere Pujal i Carabantes 2020-12-12 00:39:52 +01:00

parent 3b44b4929f 934f3aed26

commit 26870c38be

17 changed files with 2361 additions and 2292 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/icons/blind.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 648 B After Width:  |  Height:  |  Size: 1 KiB

BIN

magic/icons/emboss.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 259 B After Width:  |  Height:  |  Size: 3.1 KiB

BIN

magic/icons/fretwork.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 183 B After Width:  |  Height:  |  Size: 4.2 KiB

BIN

magic/icons/halftone.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 12 KiB

BIN

magic/icons/mosaic.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 556 B

BIN

magic/icons/rails.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 260 B After Width:  |  Height:  |  Size: 3.5 KiB

BIN

magic/icons/tornado.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 298 B After Width:  |  Height:  |  Size: 1.7 KiB

BIN

magic/icons/tv.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 986 B After Width:  |  Height:  |  Size: 1.3 KiB

BIN

magic/icons/xor.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 309 B After Width:  |  Height:  |  Size: 8.3 KiB

BIN

magic/icons/zoom.png

View file

Binary file not shown.

Side by side Swipe Overlay Before Width:  |  Height:  |  Size: 1.1 KiB After Width:  |  Height:  |  Size: 12 KiB