diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2010-03-29 17:34:22 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-03-29 17:34:22 -0700 |
| commit | b6e84b7f93c5b4a0cffd132f3c6dbf6bf58ba2b9 (patch) | |
| tree | 8d4b75e005cd72f67afe31b433c16528f8ce897f /core/isolinux.asm | |
| parent | 4121b9c7962e230f8819645ecb9d5f4eac684ed2 (diff) | |
| parent | 68a7538d5a80ec8db48c02d4a9de7199df0af9f9 (diff) | |
| download | syslinux-b6e84b7f93c5b4a0cffd132f3c6dbf6bf58ba2b9.tar.gz | |
Merge branch 'master' into pathbased
Resolved Conflicts:
MCONFIG.embedded
com32/MCONFIG
com32/include/com32.h
core/com32.inc
core/pxelinux.asm
doc/comboot.txt
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'core/isolinux.asm')
| -rw-r--r-- | core/isolinux.asm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/isolinux.asm b/core/isolinux.asm index 7329f145..d1d5bf8d 100644 --- a/core/isolinux.asm +++ b/core/isolinux.asm @@ -1048,7 +1048,7 @@ writestr_early equ writestr ; Data that needs to be in the first sector ; ----------------------------------------------------------------------------- -syslinux_banner db CR, LF, 'ISOLINUX ', VERSION_STR, ' ', DATE_STR, ' ', 0 +syslinux_banner db CR, LF, MY_NAME, ' ', VERSION_STR, ' ', DATE_STR, ' ', 0 copyright_str db ' Copyright (C) 1994-' asciidec YEAR db ' H. Peter Anvin et al', CR, LF, 0 |