aboutsummaryrefslogtreecommitdiffstats
path: root/com32/include/syslinux/video.h
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-12-22 09:38:43 -0800
committerH. Peter Anvin <hpa@zytor.com>2009-12-22 09:38:43 -0800
commit2b164fd1078bc9640836f15598ed901cc7a31ae2 (patch)
tree05c661adf5920b2408fbd1961b3bd855c75732d8 /com32/include/syslinux/video.h
parent8492da661cc77e26cd18e4cf307b78e50661ea29 (diff)
parente535becb865292360e808996409c1513df7d2be7 (diff)
downloadsyslinux-2b164fd1078bc9640836f15598ed901cc7a31ae2.tar.gz
syslinux-2b164fd1078bc9640836f15598ed901cc7a31ae2.tar.xz
syslinux-2b164fd1078bc9640836f15598ed901cc7a31ae2.zip
Merge branch 'master' into fsc
Resolved Conflicts: com32/Makefile com32/lib/sys/open.c com32/modules/Makefile dos/Makefile dos/com16.ld dos/syslinux.c version Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/include/syslinux/video.h')
0 files changed, 0 insertions, 0 deletions