diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-09-12 16:54:07 +0100 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2012-09-12 16:58:54 +0100 |
| commit | b4b40d73ad3a8e5199da8cd8eeac83780fa8b981 (patch) | |
| tree | 03226730b35c702fadd14583b2180221cda348a6 /src/xkbcomp/rules.h | |
| parent | 14cd8c79cd88e08c3a542c2d3ed596e25635a421 (diff) | |
Copyright updates
With Dan Nicholson's permission (via email), update his copyright and
license statements to the standard X.Org boilerplate MIT license, as
both myself and Ran have been using.
Clean up my copyright declarations (in some cases to correct ownership),
and add copyright/license statements from myself and/or Ran where
appropriate.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Diffstat (limited to 'src/xkbcomp/rules.h')
| -rw-r--r-- | src/xkbcomp/rules.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/xkbcomp/rules.h b/src/xkbcomp/rules.h index 9e73c3e..5381b15 100644 --- a/src/xkbcomp/rules.h +++ b/src/xkbcomp/rules.h @@ -1,5 +1,5 @@ /* - * Copyright 2009 Dan Nicholson + * Copyright © 2009 Dan Nicholson * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -8,20 +8,17 @@ * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN - * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the names of the authors or their - * institutions shall not be used in advertising or otherwise to promote the - * sale, use or other dealings in this Software without prior written - * authorization from the authors. + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. */ #ifndef XKBCOMP_RULES_H |