diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-01-10 11:16:16 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-01-10 11:16:16 -0800 |
| commit | c072d12df4b43aef3375c190358da4928a0c2a1e (patch) | |
| tree | 0305c03bf1426b0368662eefddb6758c539d80ed /extlinux | |
| parent | 1febc7936ec9c3f139d6ed993d4ec13b63c81f80 (diff) | |
| parent | 244d2fe917cec1565b4fd992ea9e8cc46749a661 (diff) | |
| download | syslinux-c072d12df4b43aef3375c190358da4928a0c2a1e.tar.gz | |
Merge commit 'origin/master' into adv
Conflicts:
extlinux/extlinux.c
Diffstat (limited to 'extlinux')
| -rw-r--r-- | extlinux/extlinux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extlinux/extlinux.c b/extlinux/extlinux.c index ac244970..58261b44 100644 --- a/extlinux/extlinux.c +++ b/extlinux/extlinux.c @@ -1,6 +1,6 @@ /* ----------------------------------------------------------------------- * * - * Copyright 1998-2007 H. Peter Anvin - All Rights Reserved + * Copyright 1998-2008 H. Peter Anvin - All Rights Reserved * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by |