aboutsummaryrefslogtreecommitdiffstats
path: root/com32/modules/kbdmap.c
diff options
context:
space:
mode:
authorPierre-Alexandre Meyer <pierre@mouraf.org>2009-04-11 10:46:38 -0700
committerPierre-Alexandre Meyer <pierre@mouraf.org>2009-04-11 10:46:38 -0700
commit51c43d5e58b0f88a2392102015c089109307fa9b (patch)
tree059e8925ccb5410145c1c823f6a8f8d956ef3002 /com32/modules/kbdmap.c
parent55de9cbffb0377dec13860a4aeb7a66e4c2b500e (diff)
parent3b80c2699cde4e159bc9af15308c480acf2c836d (diff)
downloadsyslinux.git-51c43d5e58b0f88a2392102015c089109307fa9b.tar.gz
syslinux.git-51c43d5e58b0f88a2392102015c089109307fa9b.tar.xz
syslinux.git-51c43d5e58b0f88a2392102015c089109307fa9b.zip
Merge branch 'master' into for-erwan
Conflicts: com32/hdt/Makefile
Diffstat (limited to 'com32/modules/kbdmap.c')
-rw-r--r--com32/modules/kbdmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/modules/kbdmap.c b/com32/modules/kbdmap.c
index 866acfc2..7e36a35d 100644
--- a/com32/modules/kbdmap.c
+++ b/com32/modules/kbdmap.c
@@ -1,6 +1,6 @@
/* ----------------------------------------------------------------------- *
*
- * Copyright 2009 H. Peter Anvin - All Rights Reserved
+ * Copyright 2009 Intel Corporation; author: H. Peter Anvin
*
* 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