mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2025-01-31 08:23:56 +01:00
Merge branch 'master' into unk_text_util_2
This commit is contained in:
commit
fcb7e50e44
3
.gitattributes
vendored
3
.gitattributes
vendored
@ -12,3 +12,6 @@ Makefile text eol=lf
|
||||
|
||||
*.png binary
|
||||
*.bin binary
|
||||
|
||||
*.h linguist-language=C
|
||||
*.inc linguist-language=Assembly
|
||||
|
Loading…
x
Reference in New Issue
Block a user