summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2009-09-05 16:09:44 +0200
committerholger krekel <holger@merlinux.eu>2009-09-05 16:09:44 +0200
commit7ab98c1b25d4a13331c81bed11dab54133e88ce7 (patch)
tree771512bae988fabcc40ee1983f412999880e2888 /LICENSE
parentbde56a8246310d52737da4940649172ffa015648 (diff)
downloadpytest-7ab98c1b25d4a13331c81bed11dab54133e88ce7.tar.gz
* delete or text files to hacking/ directory.
* split license file into authors and license file, minor fixes. * minor unicode fixes --HG-- branch : trunk
Diffstat (limited to 'LICENSE')
-rw-r--r--[l---------]LICENSE21
1 files changed, 20 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index 3916913c4..4099bb3e4 120000..100644
--- a/LICENSE
+++ b/LICENSE
@@ -1 +1,20 @@
-py/LICENSE \ No newline at end of file
+All files in the 'py' directory are licensed under the MIT license:
+
+ 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
+ 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.
+