aboutsummaryrefslogtreecommitdiffstats
path: root/mtools
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 /mtools
parent1febc7936ec9c3f139d6ed993d4ec13b63c81f80 (diff)
parent244d2fe917cec1565b4fd992ea9e8cc46749a661 (diff)
downloadsyslinux.git-c072d12df4b43aef3375c190358da4928a0c2a1e.tar.gz
syslinux.git-c072d12df4b43aef3375c190358da4928a0c2a1e.tar.xz
syslinux.git-c072d12df4b43aef3375c190358da4928a0c2a1e.zip
Merge commit 'origin/master' into adv
Conflicts: extlinux/extlinux.c
Diffstat (limited to 'mtools')
-rw-r--r--mtools/syslinux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mtools/syslinux.c b/mtools/syslinux.c
index 7540b2fa..46b33f4e 100644
--- a/mtools/syslinux.c
+++ b/mtools/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