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 /dos | |
| parent | 1febc7936ec9c3f139d6ed993d4ec13b63c81f80 (diff) | |
| parent | 244d2fe917cec1565b4fd992ea9e8cc46749a661 (diff) | |
| download | syslinux-c072d12df4b43aef3375c190358da4928a0c2a1e.tar.gz | |
Merge commit 'origin/master' into adv
Conflicts:
extlinux/extlinux.c
Diffstat (limited to 'dos')
| -rw-r--r-- | dos/argv.c | 2 | ||||
| -rw-r--r-- | dos/conio.c | 2 | ||||
| -rw-r--r-- | dos/syslinux.c | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -1,6 +1,6 @@ /* ----------------------------------------------------------------------- * * - * Copyright 2004 H. Peter Anvin - All Rights Reserved + * Copyright 2004-2008 H. Peter Anvin - All Rights Reserved * * Permission is hereby granted, free of charge, to any person * obtaining a copy of this software and associated documentation diff --git a/dos/conio.c b/dos/conio.c index 4d58dcbd..bf54805a 100644 --- a/dos/conio.c +++ b/dos/conio.c @@ -1,6 +1,6 @@ /* ----------------------------------------------------------------------- * * - * Copyright 2001-2004 H. Peter Anvin - All Rights Reserved + * Copyright 2001-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 diff --git a/dos/syslinux.c b/dos/syslinux.c index 58cc97ee..064859f7 100644 --- a/dos/syslinux.c +++ b/dos/syslinux.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 |