# HG changeset patch # User Matt Johnston # Date 1418996358 -28800 # Node ID c399293de16075803e83272e3da884a408a0313d # Parent 0c29d1a16c8c0773c5850fd225c594c77de20af1# Parent a976793021d24d187015240d81e6fafe3c9ba984 merge diff -r 0c29d1a16c8c -r c399293de160 LICENSE --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/LICENSE Fri Dec 19 21:39:18 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. + + diff -r 0c29d1a16c8c -r c399293de160 README.md --- a/README.md Fri Dec 19 21:39:01 2014 +0800 +++ b/README.md Fri Dec 19 21:39:18 2014 +0800 @@ -23,5 +23,3 @@ Matt Johnston matt@ucc.asn.au - -This code may be freely used, distributed, relicensed, and modified for any purpose.