aboutsummaryrefslogtreecommitdiffstats
path: root/dos
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2008-01-10 11:16:16 -0800
committerH. Peter Anvin <hpa@zytor.com>2008-01-10 11:16:16 -0800
commitc072d12df4b43aef3375c190358da4928a0c2a1e (patch)
tree0305c03bf1426b0368662eefddb6758c539d80ed /dos
parent1febc7936ec9c3f139d6ed993d4ec13b63c81f80 (diff)
parent244d2fe917cec1565b4fd992ea9e8cc46749a661 (diff)
downloadsyslinux-devel-c072d12df4b43aef3375c190358da4928a0c2a1e.tar.gz
syslinux-devel-c072d12df4b43aef3375c190358da4928a0c2a1e.tar.xz
syslinux-devel-c072d12df4b43aef3375c190358da4928a0c2a1e.zip
Merge commit 'origin/master' into adv
Conflicts: extlinux/extlinux.c
Diffstat (limited to 'dos')
-rw-r--r--dos/argv.c2
-rw-r--r--dos/conio.c2
-rw-r--r--dos/syslinux.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/dos/argv.c b/dos/argv.c
index 9aaa4d38..84888b03 100644
--- a/dos/argv.c
+++ b/dos/argv.c
@@ -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