Merge branch 'master' into unk_text_util_2

This commit is contained in:
PikalaxALT 2017-09-22 21:19:08 -04:00
commit fcb7e50e44

3
.gitattributes vendored
View file

@ -12,3 +12,6 @@ Makefile text eol=lf
*.png binary
*.bin binary
*.h linguist-language=C
*.inc linguist-language=Assembly