aboutsummaryrefslogtreecommitdiffstats
path: root/win32
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 /win32
parent1febc7936ec9c3f139d6ed993d4ec13b63c81f80 (diff)
parent244d2fe917cec1565b4fd992ea9e8cc46749a661 (diff)
downloadsyslinux-c072d12df4b43aef3375c190358da4928a0c2a1e.tar.gz
syslinux-c072d12df4b43aef3375c190358da4928a0c2a1e.tar.xz
syslinux-c072d12df4b43aef3375c190358da4928a0c2a1e.zip
Merge commit 'origin/master' into adv
Conflicts: extlinux/extlinux.c
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile2
-rw-r--r--win32/syslinux.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/win32/Makefile b/win32/Makefile
index 9bd483a5..037002b0 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -1,6 +1,6 @@
## -----------------------------------------------------------------------
##
-## Copyright 1998-2006 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
diff --git a/win32/syslinux.c b/win32/syslinux.c
index 7b205a9e..1699125b 100644
--- a/win32/syslinux.c
+++ b/win32/syslinux.c
@@ -1,7 +1,7 @@
/* ----------------------------------------------------------------------- *
*
* Copyright 2003 Lars Munch Christensen - All Rights Reserved
- * Copyright 1998-2007 H. Peter Anvin - All Rights Reserved
+ * Copyright 1998-2008 H. Peter Anvin - All Rights Reserved
*
* Based on the Linux installer program for SYSLINUX by H. Peter Anvin
*