diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2014-01-18 16:11:39 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2014-01-18 16:11:39 -0800 |
| commit | b4cd1a45b9ca8ed5a0cd214231103bacd3e067e8 (patch) | |
| tree | 1dadca813cdf5fd8d78494d9342237badac5dc96 /linux | |
| parent | f77bb1d32dd96036661fc4f62045dcb04414056b (diff) | |
| parent | 374a37434fa11bdc95e0bc243aadb7de36bbbf43 (diff) | |
| download | syslinux-b4cd1a45b9ca8ed5a0cd214231103bacd3e067e8.tar.gz | |
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 'linux')
| -rw-r--r-- | linux/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/Makefile b/linux/Makefile index d7facaf4..25d3201e 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -68,4 +68,4 @@ strip: %.s: %.c $(CC) $(UMAKEDEPS) $(CFLAGS) -S -o $@ $< --include .*.d *.tmp +-include .*.d |