diff options
| author | Keith Packard <keithp@keithp.com> | 2010-04-13 14:55:57 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2010-04-13 14:55:57 -0700 |
| commit | 7068a11b2b1cfd4fc420e1527f46bf993308e48a (patch) | |
| tree | cf13bee93585a801a97c76eab6783a8f82e0d19e /resourceproto | |
| parent | 1ba45a2dc8b08b4d98d4af21e3ab41dec205e974 (diff) | |
This takes all of the COPYING files and merges their contents
together. In cases where the contents exactly matched the current
canonical copyright form, they were removed entirely. All of the
copyright holder names were sorted into a single list at the top.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'resourceproto')
| -rw-r--r-- | resourceproto/COPYING | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/resourceproto/COPYING b/resourceproto/COPYING deleted file mode 100644 index 9f1e999..0000000 --- a/resourceproto/COPYING +++ /dev/null @@ -1,20 +0,0 @@ -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 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 -XFREE86 PROJECT 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 name of the XFree86 Project 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 XFree86 Project. |