diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-10-24 16:43:49 +1100 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2012-10-24 16:43:49 +1100 |
| commit | 0ebd1e45f2245807aa5f64797f8b2b54d75818f2 (patch) | |
| tree | 26635e66eed5b5e7a18e084adff5b0fbace3dbfd | |
| parent | 538fa7d01d07336c327cf470f49177e9f19a8f71 (diff) | |
Update COPYING
Insert the standard MIT/X11 license used for X.Org contributions, where
there was none previously. Consent obtained from the two other
copyright holders via email.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
| -rw-r--r-- | COPYING | 24 | ||||
| -rw-r--r-- | src/wlshm.c | 28 |
2 files changed, 48 insertions, 4 deletions
@@ -1,2 +1,22 @@ -Copyright 2002, SuSE Linux AG, Author: Egbert Eich -Copyright 2011, commonIT, Author: Corentin Chary +Copyright © 2002 SuSE Linux AG +Copyright © 2010 commonIT +Copyright © 2012 Raspberry Pi Foundation + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +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 (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 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. diff --git a/src/wlshm.c b/src/wlshm.c index d95f165..f50a973 100644 --- a/src/wlshm.c +++ b/src/wlshm.c @@ -1,6 +1,30 @@ /* - * Copyright 2002, SuSE Linux AG, Author: Egbert Eich - * Copyright 2010, commonIT, Author: Corentin Chary + * Copyright © 2002 SuSE Linux AG + * Copyright © 2010 commonIT + * Copyright © 2012 Raspberry Pi Foundation + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * 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 (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 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. + * + * Authors: Egbert Eich <eich@freedesktop.org> + * Corentin Chary <corentincj@iksaif.net> + * Daniel Stone <daniel@fooishbar.org> */ #ifdef HAVE_CONFIG_H |