diff options
| author | Pierre-Alexandre Meyer <pierre@mouraf.org> | 2009-09-07 16:12:59 -0700 |
|---|---|---|
| committer | Pierre-Alexandre Meyer <pierre@mouraf.org> | 2009-09-07 16:22:36 -0700 |
| commit | e9069caefc1460ec7f4d058796005474c125fc61 (patch) | |
| tree | 25cd847439fb004798251a63fa8886073134009f /com32/gplinclude/cpuid.h | |
| parent | c93e27af183de1cdf591706448d42887d0fbc0eb (diff) | |
| parent | 03b2384b6e9f54d9697e87d2a19c321e6fd96ed5 (diff) | |
| download | syslinux.git-e9069caefc1460ec7f4d058796005474c125fc61.tar.gz syslinux.git-e9069caefc1460ec7f4d058796005474c125fc61.tar.xz syslinux.git-e9069caefc1460ec7f4d058796005474c125fc61.zip | |
Merge branch 'bootloader-detection' into hdt-next
Conflicts:
com32/hdt/hdt-cli-disk.c
com32/hdt/hdt-common.h
com32/hdt/hdt-menu-disk.c
Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
Diffstat (limited to 'com32/gplinclude/cpuid.h')
0 files changed, 0 insertions, 0 deletions