diff options
| author | Vadim Shpakovski | 2013-02-07 00:42:46 -0800 | 
|---|---|---|
| committer | Vadim Shpakovski | 2013-02-07 00:42:46 -0800 | 
| commit | caf0c1e95e0001b07a2629f89ef564dc0d9173ee (patch) | |
| tree | 9c31797948357155689b7394d66eb6d029c65453 | |
| parent | 20d323b59c68fcfdc398d670b3a4cc2f9b367da8 (diff) | |
| parent | 7f0769adf49a9f968377b5acec04e0f43e00b370 (diff) | |
| download | MASShortcut-caf0c1e95e0001b07a2629f89ef564dc0d9173ee.tar.bz2 | |
Merge pull request #19 from uasi/disambiguate-license
Disambiguate "the BSD license"
| -rw-r--r-- | LICENSE | 22 | ||||
| -rw-r--r-- | README.md | 2 | 
2 files changed, 23 insertions, 1 deletions
@@ -0,0 +1,22 @@ +Copyright (c) 2012-2013, Vadim Shpakovski +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this +   list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, +   this list of conditions and the following disclaimer in the documentation +   and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. @@ -31,4 +31,4 @@ If you like retain/release, please check out these forks: [heardrwt/MASShortcut]  # Copyright -MASShortcut is licensed under the BSD license. +MASShortcut is licensed under the 2-clause BSD license.  | 
