aboutsummaryrefslogtreecommitdiffstats
path: root/libinstaller
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 /libinstaller
parent1febc7936ec9c3f139d6ed993d4ec13b63c81f80 (diff)
parent244d2fe917cec1565b4fd992ea9e8cc46749a661 (diff)
downloadlwip-c072d12df4b43aef3375c190358da4928a0c2a1e.tar.gz
lwip-c072d12df4b43aef3375c190358da4928a0c2a1e.tar.xz
lwip-c072d12df4b43aef3375c190358da4928a0c2a1e.zip
Merge commit 'origin/master' into adv
Conflicts: extlinux/extlinux.c
Diffstat (limited to 'libinstaller')
-rw-r--r--libinstaller/setadv.c2
-rw-r--r--libinstaller/syslinux.h2
-rw-r--r--libinstaller/syslxint.h2
-rw-r--r--libinstaller/syslxmod.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/libinstaller/setadv.c b/libinstaller/setadv.c
index e786e401..4756a97d 100644
--- a/libinstaller/setadv.c
+++ b/libinstaller/setadv.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/libinstaller/syslinux.h b/libinstaller/syslinux.h
index dd04aadf..efffb7c0 100644
--- a/libinstaller/syslinux.h
+++ b/libinstaller/syslinux.h
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------- *
*
- * Copyright 1998-2004 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/libinstaller/syslxint.h b/libinstaller/syslxint.h
index e296df1d..852f9e36 100644
--- a/libinstaller/syslxint.h
+++ b/libinstaller/syslxint.h
@@ -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/libinstaller/syslxmod.c b/libinstaller/syslxmod.c
index 425756f3..fb2f1d7a 100644
--- a/libinstaller/syslxmod.c
+++ b/libinstaller/syslxmod.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