aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@linux.intel.com>2011-04-04 10:45:25 +0100
committerMatt Fleming <matt.fleming@linux.intel.com>2011-04-04 14:52:19 +0100
commit8e5e9b0a8c9f3fea4faa68f4d32080e220b8c498 (patch)
tree240ba077da896f72439806879db6f89417f8e3cf /.gitignore
parent8c576f1fe03e34879921311f46613a35c6530000 (diff)
parent780bab7c179247f1c42610c1f70d99f996e787ec (diff)
downloadsyslinux-8e5e9b0a8c9f3fea4faa68f4d32080e220b8c498.tar.gz
syslinux-8e5e9b0a8c9f3fea4faa68f4d32080e220b8c498.tar.xz
syslinux-8e5e9b0a8c9f3fea4faa68f4d32080e220b8c498.zip
Merge remote-tracking branch 'zytor/master' into elflink-merge
Conflicts: com32/lib/Makefile com32/lib/sys/open.c version
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 512a270d..05f0d145 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,8 @@
*.elf
*.exe
*.gen
+*.img
+*.img.xz
*.lib
*.lnx
*.lo
@@ -29,6 +31,7 @@
.\#*
.depend
/com32/lib/sys/vesa/alphatbl.c
+/diag/geodsp/mk-lba-img
/extlinux/extlinux
/memdisk/memdisk
/mtools/syslinux