resolve merge conflict about graphics_file_rules.mk and prepare for adding pokemon graphics

This commit is contained in:
paul committed 2018-10-10 22:54:23 +02:00
commit 3f0827128a
42 files changed
+1111 -2350

No files matched your search

+2
View File
@@ -91,6 +91,8 @@ tidy:
include graphics_file_rules.mk
include graphics_file_rules.mk
%.s: ;
%.png: ;
%.pal: ;