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

2018-10-10 22:54:23 +02:00
parent 1ee1ebe23a 10fff9c6f2
commit 3f0827128a
42 changed files with 1111 additions and 2350 deletions
@@ -91,6 +91,8 @@ tidy:
 	
 include graphics_file_rules.mk

+include graphics_file_rules.mk
+
 %.s: ;
 %.png: ;
 %.pal: ;