From fcdf6ace823d1849acc323def3e632c7e85701fc Mon Sep 17 00:00:00 2001 From: Andrew Gallant Date: Wed, 15 Apr 2015 19:11:07 -0400 Subject: [PATCH] dual licensed under MIT and UNLICENSE --- COPYING | 3 +++ Cargo.toml | 2 +- LICENSE-MIT | 21 +++++++++++++++++++++ README.md | 2 ++ 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 COPYING create mode 100644 LICENSE-MIT diff --git a/COPYING b/COPYING new file mode 100644 index 000000000..bb9c20a09 --- /dev/null +++ b/COPYING @@ -0,0 +1,3 @@ +This project is dual-licensed under the Unlicense and MIT licenses. + +You may use this code under the terms of either license. diff --git a/Cargo.toml b/Cargo.toml index 9829f59ae..b243386fd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://github.com/BurntSushi/xsv" repository = "https://github.com/BurntSushi/xsv" readme = "README.md" keywords = ["csv", "tsv", "slice", "command"] -license = "Unlicense" +license = "Unlicense/MIT" [[bin]] name = "xsv" diff --git a/LICENSE-MIT b/LICENSE-MIT new file mode 100644 index 000000000..3b0a5dc09 --- /dev/null +++ b/LICENSE-MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015 Andrew Gallant + +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 --git a/README.md b/README.md index 7b55efba3..a9a529245 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ a quick tour of several commands. [![Build status](https://api.travis-ci.org/BurntSushi/xsv.png)](https://travis-ci.org/BurntSushi/xsv) +Dual-licensed under MIT or the [UNLICENSE](http://unlicense.org). + ### Available commands