diff options
author | H. Peter Anvin <hpa@zytor.com> | 2014-01-18 16:12:25 -0800 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2014-01-18 16:12:25 -0800 |
commit | ba3c1d66fc9f6638ea22949e71d10dc4f7e83796 (patch) | |
tree | ed8faa89356c801de088a99c42ccb3b4ba75790e /com32/modules/vesainfo.c | |
parent | 71a3d797f62b0d7560cb52e148f65fa9375965bf (diff) | |
parent | b4cd1a45b9ca8ed5a0cd214231103bacd3e067e8 (diff) | |
download | syslinux-ba3c1d66fc9f6638ea22949e71d10dc4f7e83796.tar.gz syslinux-ba3c1d66fc9f6638ea22949e71d10dc4f7e83796.tar.xz syslinux-ba3c1d66fc9f6638ea22949e71d10dc4f7e83796.zip |
Merge remote-tracking branch 'origin/syslinux-5.xx'
Resolved Conflicts:
version
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/modules/vesainfo.c')
0 files changed, 0 insertions, 0 deletions