aboutsummaryrefslogtreecommitdiffstats
path: root/com32/cmenu
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2012-06-28 21:34:28 -0700
committerH. Peter Anvin <hpa@zytor.com>2012-06-28 21:34:28 -0700
commit53f267c1e4c6c51819a355e163b4b6c3214a852e (patch)
tree376ef236f9de744df4f56e8d13e82f869973a10f /com32/cmenu
parent9794e01d73e5cc2621f85d91b0577e33df9920fb (diff)
parent15cbfdfd390402057d237664ac087140608bf80b (diff)
downloadsyslinux-53f267c1e4c6c51819a355e163b4b6c3214a852e.tar.gz
syslinux-53f267c1e4c6c51819a355e163b4b6c3214a852e.tar.xz
syslinux-53f267c1e4c6c51819a355e163b4b6c3214a852e.zip
Merge remote-tracking branch 'origin/master' into elflink
Conflicts: core/fs/lib/searchconfig.c Get the reverse pathname lookup fixes from the master branch.
Diffstat (limited to 'com32/cmenu')
0 files changed, 0 insertions, 0 deletions