aboutsummaryrefslogtreecommitdiffstats
path: root/mtools/Makefile
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-07-19 16:56:35 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-07-19 16:56:35 -0700
commit04485f48391455fbd528640eff54ab09c23f8d93 (patch)
treec3b7ced66c5a0f2e571625da64af0b52a05c4c5d /mtools/Makefile
parent9b18ab6c1019239a19160290775460601c569357 (diff)
parent9b30e3868cc76c13766bb686024832f274d97c45 (diff)
downloadsyslinux-04485f48391455fbd528640eff54ab09c23f8d93.tar.gz
syslinux-04485f48391455fbd528640eff54ab09c23f8d93.tar.xz
syslinux-04485f48391455fbd528640eff54ab09c23f8d93.zip
Merge branch 'master' into libinstaller_dos_wip
Resolved Conflicts: libinstaller/syslxopt.c mtools/syslinux.c Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'mtools/Makefile')
0 files changed, 0 insertions, 0 deletions