diff options
| author | Pierre-Alexandre Meyer <pierre@mouraf.org> | 2009-09-07 16:23:48 -0700 |
|---|---|---|
| committer | Pierre-Alexandre Meyer <pierre@mouraf.org> | 2009-09-07 16:23:48 -0700 |
| commit | 47ac912cd5d8df0a96b8f5b98d7476f7cfb1cb19 (patch) | |
| tree | cad3d89e5ffbc713877091eee96493a9471f848c /com32/gplinclude/cpuid.h | |
| parent | e9069caefc1460ec7f4d058796005474c125fc61 (diff) | |
| parent | 39758675d88eb2b0d5c64239aa5d47df61e4d106 (diff) | |
| download | syslinux.git-47ac912cd5d8df0a96b8f5b98d7476f7cfb1cb19.tar.gz syslinux.git-47ac912cd5d8df0a96b8f5b98d7476f7cfb1cb19.tar.xz syslinux.git-47ac912cd5d8df0a96b8f5b98d7476f7cfb1cb19.zip | |
Merge branch 'cmenu-video' into hdt-next
Conflicts:
com32/hdt/hdt-cli-disk.c
com32/hdt/hdt-common.c
Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Diffstat (limited to 'com32/gplinclude/cpuid.h')
0 files changed, 0 insertions, 0 deletions