aboutsummaryrefslogtreecommitdiffstats
path: root/win32
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2014-01-18 16:11:39 -0800
committerH. Peter Anvin <hpa@zytor.com>2014-01-18 16:11:39 -0800
commitb4cd1a45b9ca8ed5a0cd214231103bacd3e067e8 (patch)
tree1dadca813cdf5fd8d78494d9342237badac5dc96 /win32
parentf77bb1d32dd96036661fc4f62045dcb04414056b (diff)
parent374a37434fa11bdc95e0bc243aadb7de36bbbf43 (diff)
downloadsyslinux-b4cd1a45b9ca8ed5a0cd214231103bacd3e067e8.tar.gz
syslinux-b4cd1a45b9ca8ed5a0cd214231103bacd3e067e8.tar.xz
syslinux-b4cd1a45b9ca8ed5a0cd214231103bacd3e067e8.zip
Merge remote-tracking branch 'origin/syslinux-4.xx' into syslinux-5.xx
Resolved Conflicts: version Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile2
-rw-r--r--win32/ntfstest/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/win32/Makefile b/win32/Makefile
index 9ff8a453..b54e4d64 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -100,4 +100,4 @@ syslinux.exe: $(OBJS) $(LIB)
%.s: %.c
$(WINCC) $(UMAKEDEPS) $(WINCFLAGS) -S -o $@ $<
--include .*.d *.tmp
+-include .*.d
diff --git a/win32/ntfstest/Makefile b/win32/ntfstest/Makefile
index 00e89cf9..04837ca6 100644
--- a/win32/ntfstest/Makefile
+++ b/win32/ntfstest/Makefile
@@ -84,4 +84,4 @@ ntfstest.exe: $(OBJS) $(RESS)
%.res: %.rc
$(WINDRES) -O COFF $< $@
--include .*.d *.tmp
+-include .*.d