aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-05-20 20:32:21 -0700
committerH. Peter Anvin <hpa@zytor.com>2010-05-20 20:32:21 -0700
commit0d5516e0e0a50d618e4d5b5de171c7562a902588 (patch)
tree3fab36de6519048d480bcf31f0a23e1577a318a5 /.gitignore
parente4fc443f9b70f188963ff33e0a16ccb72a553540 (diff)
parentdc81681f81225d6f22cc8e3afcf07a286e02ca62 (diff)
downloadsyslinux-0d5516e0e0a50d618e4d5b5de171c7562a902588.tar.gz
syslinux-0d5516e0e0a50d618e4d5b5de171c7562a902588.tar.xz
syslinux-0d5516e0e0a50d618e4d5b5de171c7562a902588.zip
Merge remote branch 'origin/master' into pathbased
Resolved Conflicts: com32/modules/cat.c Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index c7866759..e8c0dd15 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,9 @@
/linux/syslinux
/linux/syslinux-nomtools
/utils/gethostip
+/utils/isohdpfx.c
/utils/isohybrid
+/utils/isohybrid.pl
/utils/mkdiskimage
/version.h
/version.mk