Merge branch 'master' into unk_text_util_2

2017-09-22 21:19:08 -04:00
parent 561d60342f 2ad419e4b9
commit fcb7e50e44
1 changed files with 3 additions and 0 deletions
@@ -12,3 +12,6 @@ Makefile text eol=lf
 *.png binary
 *.bin binary
 *.h linguist-language=C
 *.inc linguist-language=Assembly