diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2010-02-05 17:28:27 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-05 17:28:27 -0800 |
| commit | 2dafb8402ed666b37f96f6e1579a99b8a8c85452 (patch) | |
| tree | 9ea825be372220a88d927041692722648e421394 /modules | |
| parent | 3e48cb37712f34a158ea6b0f491c6ba37aab4c10 (diff) | |
| parent | 88c00aca310b7bade07833d3021cae9da266eae7 (diff) | |
| download | syslinux-4.00-pre17.tar.gz | |
Merge branch 'master' into fscsyslinux-4.00-pre17fsc
Resolved Conflicts:
core/pxelinux.asm
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'modules')
0 files changed, 0 insertions, 0 deletions