aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-10-11 21:16:37 +0100
committerMatt Fleming <matt.fleming@intel.com>2012-10-11 21:17:58 +0100
commit940d4876ab8dc6dcbdbf47ba8be98cba0516c66e (patch)
treeb42256b0f3344a52622febf3306933ae1f8bd864 /Makefile
parent7d9ee65cc9577eb69782a49a34895ae80820e9ff (diff)
parent85dba2c3058996d72def4a44304df882da3aa807 (diff)
downloadsyslinux-940d4876ab8dc6dcbdbf47ba8be98cba0516c66e.tar.gz
syslinux-940d4876ab8dc6dcbdbf47ba8be98cba0516c66e.tar.xz
syslinux-940d4876ab8dc6dcbdbf47ba8be98cba0516c66e.zip
Merge branch 'pxechn-fix-news-for-hpa-2' of git://github.com/geneC/syslinux
Conflicts: NEWS com32/modules/Makefile
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions