aboutsummaryrefslogtreecommitdiffstats
path: root/com32/modules
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2010-07-30 10:24:04 -0700
committerH. Peter Anvin <hpa@zytor.com>2010-07-30 10:24:04 -0700
commit00fff30973174315088b358402a9ef73dab31cf8 (patch)
tree264af3bcbf904bceb2b82bed129f6ca032b1c5c5 /com32/modules
parent8afab2175c3df81fdc532930585003c712a219f1 (diff)
parentbf3bb172a13f5f157c89ee3f6c31785971ae7b37 (diff)
downloadsyslinux-00fff30973174315088b358402a9ef73dab31cf8.tar.gz
syslinux-00fff30973174315088b358402a9ef73dab31cf8.tar.xz
syslinux-00fff30973174315088b358402a9ef73dab31cf8.zip
Merge branch 'master' into disklib
Resolved Conflicts: com32/modules/chain.c Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/modules')
0 files changed, 0 insertions, 0 deletions