Merge branch 'master' into sdl2.0

Merging master 2019-september-24 into sdl2.0 branch
This commit is contained in:
Pere Pujal i Carabantes 2019-09-24 14:52:40 +02:00
commit a1c778135d
52 changed files with 921 additions and 803 deletions

7
.gitignore vendored
View file

@ -1,8 +1,5 @@
*~
.DS_Store
dummy.o
*.dylib
*.dylib.dSYM
*.o
obj/parse.c
obj/parse_step1.c
@ -13,3 +10,7 @@ trans/
tuxpaint
TuxPaint.app
TuxPaint.dmg
*.dylib
*.dylib.dSYM
.DS_Store
*.thumbs