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 /com32/samples | |
parent | 1febc7936ec9c3f139d6ed993d4ec13b63c81f80 (diff) | |
parent | 244d2fe917cec1565b4fd992ea9e8cc46749a661 (diff) | |
download | syslinux-c072d12df4b43aef3375c190358da4928a0c2a1e.tar.gz |
Merge commit 'origin/master' into adv
Conflicts:
extlinux/extlinux.c
Diffstat (limited to 'com32/samples')
-rw-r--r-- | com32/samples/Makefile | 2 | ||||
-rw-r--r-- | com32/samples/advdump.c | 2 | ||||
-rw-r--r-- | com32/samples/fancyhello.c | 2 | ||||
-rw-r--r-- | com32/samples/hello.c | 2 | ||||
-rw-r--r-- | com32/samples/keytest.c | 2 | ||||
-rw-r--r-- | com32/samples/resolv.c | 2 | ||||
-rw-r--r-- | com32/samples/serialinfo.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/com32/samples/Makefile b/com32/samples/Makefile index 197e9114..a203bbfd 100644 --- a/com32/samples/Makefile +++ b/com32/samples/Makefile @@ -1,6 +1,6 @@ ## ----------------------------------------------------------------------- ## -## Copyright 2001-2007 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/com32/samples/advdump.c b/com32/samples/advdump.c index f50401b9..2e2ef391 100644 --- a/com32/samples/advdump.c +++ b/com32/samples/advdump.c @@ -1,6 +1,6 @@ /* ----------------------------------------------------------------------- * * - * Copyright 2007 H. Peter Anvin - All Rights Reserved + * Copyright 2007-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/com32/samples/fancyhello.c b/com32/samples/fancyhello.c index 0c8987fc..a6c5a375 100644 --- a/com32/samples/fancyhello.c +++ b/com32/samples/fancyhello.c @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------- * * - * Copyright 2004 H. Peter Anvin - All Rights Reserved + * Copyright 2004-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/com32/samples/hello.c b/com32/samples/hello.c index f7f72496..4b29901d 100644 --- a/com32/samples/hello.c +++ b/com32/samples/hello.c @@ -1,6 +1,6 @@ /* ----------------------------------------------------------------------- * * - * Copyright 2004 H. Peter Anvin - All Rights Reserved + * Copyright 2004-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/com32/samples/keytest.c b/com32/samples/keytest.c index 9fd5755a..69786442 100644 --- a/com32/samples/keytest.c +++ b/com32/samples/keytest.c @@ -1,6 +1,6 @@ /* ----------------------------------------------------------------------- * * - * Copyright 2004 H. Peter Anvin - All Rights Reserved + * Copyright 2004-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/com32/samples/resolv.c b/com32/samples/resolv.c index 1028c191..02cc0a83 100644 --- a/com32/samples/resolv.c +++ b/com32/samples/resolv.c @@ -1,6 +1,6 @@ /* ----------------------------------------------------------------------- * * - * Copyright 2004 H. Peter Anvin - All Rights Reserved + * Copyright 2004-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/com32/samples/serialinfo.c b/com32/samples/serialinfo.c index 0315327e..953a7054 100644 --- a/com32/samples/serialinfo.c +++ b/com32/samples/serialinfo.c @@ -1,6 +1,6 @@ /* ----------------------------------------------------------------------- * * - * Copyright 2007 H. Peter Anvin - All Rights Reserved + * Copyright 2007-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 |