diff options
author | Keith Packard <keithp@keithp.com> | 2011-07-01 15:45:45 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2011-07-01 15:45:45 -0700 |
commit | d4096abb591353405417e53816e5c46e904e7b25 (patch) | |
tree | 156a4ea91e225565add01b850dbbd4f8bf68f603 /hw/kdrive/linux | |
parent | 61f87a75f2bcda939a1778d39be8cfa5c886e6d8 (diff) | |
parent | 87d4f90bfcb509471ac9e7886e14a92b33223fd7 (diff) |
Merge remote-tracking branch 'whot/for-keith'
Diffstat (limited to 'hw/kdrive/linux')
-rw-r--r-- | hw/kdrive/linux/keyboard.c | 8 | ||||
-rw-r--r-- | hw/kdrive/linux/linux.c | 2 | ||||
-rw-r--r-- | hw/kdrive/linux/mouse.c | 2 | ||||
-rw-r--r-- | hw/kdrive/linux/ps2.c | 2 | ||||
-rw-r--r-- | hw/kdrive/linux/tslib.c | 10 |
5 files changed, 12 insertions, 12 deletions
diff --git a/hw/kdrive/linux/keyboard.c b/hw/kdrive/linux/keyboard.c index e05c5abad..f5f9d9b8a 100644 --- a/hw/kdrive/linux/keyboard.c +++ b/hw/kdrive/linux/keyboard.c @@ -1,10 +1,10 @@ /* - * Copyright © 1999 Keith Packard - * XKB integration © 2006 Nokia Corporation, author: Tomas Frydrych <tf@o-hand.com> + * Copyright © 1999 Keith Packard + * XKB integration © 2006 Nokia Corporation, author: Tomas Frydrych <tf@o-hand.com> * * LinuxKeyboardRead() XKB code based on xf86KbdLnx.c: - * Copyright © 1990,91 by Thomas Roell, Dinkelscherben, Germany. - * Copyright © 1994-2001 by The XFree86 Project, Inc. + * Copyright © 1990,91 by Thomas Roell, Dinkelscherben, Germany. + * Copyright © 1994-2001 by The XFree86 Project, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c index 9863c1424..a53db4965 100644 --- a/hw/kdrive/linux/linux.c +++ b/hw/kdrive/linux/linux.c @@ -1,5 +1,5 @@ /* - * Copyright © 1999 Keith Packard + * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/hw/kdrive/linux/mouse.c b/hw/kdrive/linux/mouse.c index 1db534863..93c207817 100644 --- a/hw/kdrive/linux/mouse.c +++ b/hw/kdrive/linux/mouse.c @@ -1,5 +1,5 @@ /* - * Copyright © 2001 Keith Packard + * Copyright © 2001 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/hw/kdrive/linux/ps2.c b/hw/kdrive/linux/ps2.c index 552a3c7cb..465b963f2 100644 --- a/hw/kdrive/linux/ps2.c +++ b/hw/kdrive/linux/ps2.c @@ -1,5 +1,5 @@ /* - * Copyright © 1999 Keith Packard + * Copyright © 1999 Keith Packard * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that diff --git a/hw/kdrive/linux/tslib.c b/hw/kdrive/linux/tslib.c index 570cbf99a..1f30ccae7 100644 --- a/hw/kdrive/linux/tslib.c +++ b/hw/kdrive/linux/tslib.c @@ -4,11 +4,11 @@ * Derived from ts.c by Keith Packard * Derived from ps2.c by Jim Gettys * - * Copyright © 1999 Keith Packard - * Copyright © 2000 Compaq Computer Corporation - * Copyright © 2002 MontaVista Software Inc. - * Copyright © 2005 OpenedHand Ltd. - * Copyright © 2006 Nokia Corporation + * Copyright © 1999 Keith Packard + * Copyright © 2000 Compaq Computer Corporation + * Copyright © 2002 MontaVista Software Inc. + * Copyright © 2005 OpenedHand Ltd. + * Copyright © 2006 Nokia Corporation * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that |