summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2016-06-19 00:59:10 -0400
committeryenatch <yenatch@gmail.com>2016-06-19 00:59:10 -0400
commite25c45ec90bacbc5de5d8ff48250107671e6eb67 (patch)
treead89390bfcc1adb8e0ddce95c85c4f2dfcf556f5 /Makefile
parent08ea5a9ba15164dfdaa8839048f98b8ba874b07a (diff)
parent42f11811599b01d0233b360758f5bd9b3c5bcdfb (diff)
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 74523e44e..66981259f 100644
--- a/Makefile
+++ b/Makefile
@@ -72,7 +72,7 @@ include castform.mk
include tilesets.mk
include fonts.mk
include generated.mk
-include menu.mk
+include misc.mk
%.png: ;
%.pal: ;