changeset 515:de28de7a10c6

More accurate license
author Matt Johnston <matt@ucc.asn.au>
date Fri, 04 Jul 2014 21:31:34 +0800
parents ac77dd191d49
children a976793021d2
files LICENSE README.md
diffstat 2 files changed, 30 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/LICENSE	Fri Jul 04 21:31:34 2014 +0800
@@ -0,0 +1,30 @@
+The code in web/ and py/ is licensed mostly under the MIT-style license below.
+Exceptions are the third-party dependencies - riotjs, bottle, jquery which
+are under their own licenses.
+
+old/main.c is under the license below too.
+Other old/ code has various licenses, see individual files.
+
+---
+
+Copyright (c) 2012-2014 Matt Johnston
+
+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.
+
+
--- a/README.md	Thu Jun 26 23:06:10 2014 +0800
+++ b/README.md	Fri Jul 04 21:31:34 2014 +0800
@@ -23,5 +23,3 @@
 
 Matt Johnston
 [email protected]
-
-This code may be freely used, distributed, relicensed, and modified for any purpose.