diff options
| author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-04-07 17:24:16 +0930 |
|---|---|---|
| committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-04-07 17:24:16 +0930 |
| commit | e3b705dc15d07bbb478ced6b54a5e0553d978113 (patch) | |
| tree | 59151843c1b93283fc7895e62a463ea2a629ba96 /src/xinput.h | |
| parent | ac3498c9b8a54143a9d023fe530c62e24c4651e0 (diff) | |
| parent | 834422a9c68ecf84f5b8477567a785bc8e26217a (diff) | |
Merge branch 'master' into mpx
Conflicts:
src/xinput.c
(just a whitespace conflict)
Diffstat (limited to 'src/xinput.h')
| -rw-r--r-- | src/xinput.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/xinput.h b/src/xinput.h index 961d1f7..add9aab 100644 --- a/src/xinput.h +++ b/src/xinput.h @@ -5,15 +5,15 @@ * 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 Frederic Lepied not be used in + * documentation, and that the name of the authors not be used in * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Frederic Lepied makes no + * specific, written prior permission. The authors make no * representations about the suitability of this software for any purpose. It * is provided "as is" without express or implied warranty. * - * FREDERIC LEPIED DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * THE AUTHORS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL FREDERIC LEPIED BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * EVENT SHALL THE AUTHORS 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 |