diff options
| author | Zephaniah E. Hull <warp@agamemnon.b5> | 2007-06-05 23:14:46 -0400 |
|---|---|---|
| committer | Zephaniah E. Hull <warp@agamemnon.b5> | 2007-06-05 23:14:46 -0400 |
| commit | 26dbf38041ebe67e7ab399a6746684a404ea2121 (patch) | |
| tree | 5d8574380f5b0d929be1e0acf4d117c90b4d91ea /src/evdev.c | |
| parent | Alright, this is a really big commit that breaks stuff. (diff) | |
| parent | Fix header file #ifdef guard. (diff) | |
| download | xf86-input-evdev-26dbf38041ebe67e7ab399a6746684a404ea2121.tar.gz xf86-input-evdev-26dbf38041ebe67e7ab399a6746684a404ea2121.tar.bz2 xf86-input-evdev-26dbf38041ebe67e7ab399a6746684a404ea2121.zip | |
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-evdev
Conflicts:
src/evdev.h
Diffstat (limited to 'src/evdev.c')
| -rw-r--r-- | src/evdev.c | 29 |
1 files changed, 4 insertions, 25 deletions
diff --git a/src/evdev.c b/src/evdev.c index 3b91e53..970135c 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1,5 +1,6 @@ /* * Copyright © 2006 Zephaniah E. Hull + * Copyright © 2004 Red Hat, Inc. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Soft- @@ -26,31 +27,9 @@ * other dealings in this Software without prior written authorization of * the copyright holder. * - * Author: Zephaniah E. Hull (warp@aehallh.com) - */ -/* - * Copyright © 2004 Red Hat, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software - * and its documentation for any purpose is hereby granted without - * fee, provided that the above copyright notice appear in all copies - * and that both that copyright notice and this permission notice - * appear in supporting documentation, and that the name of Red Hat - * not be used in advertising or publicity pertaining to distribution - * of the software without specific, written prior permission. Red - * Hat makes no representations about the suitability of this software - * for any purpose. It is provided "as is" without express or implied - * warranty. - * - * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN - * NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, - * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Author: Kristian Høgsberg (krh@redhat.com) + * Authors: + * Zephaniah E. Hull (warp@aehallh.com), + * Kristian Høgsberg (krh@redhat.com) */ #ifdef HAVE_CONFIG_H |