Permalink
Browse files

Updated readme and moved to BSD-3 license

  • Loading branch information...
1 parent 60bd4fa commit 792dc971e5e3f7b815196f8ccfaa8c73710b86aa @robhawkes robhawkes committed Jun 10, 2016
Showing with 10 additions and 24 deletions.
  1. +9 −17 LICENSE
  2. +1 −7 README.md
View
@@ -1,21 +1,13 @@
-The MIT License (MIT)
+Copyright (c) 2016, UrbanSim Inc.
+Copyright (c) 2013-2016, Robin Hawkes
+All rights reserved.
-Copyright (c) 2016 ViziCities <hello@vizicities.com>
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-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:
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+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.
-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.
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+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 HOLDER 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.
View
@@ -1,9 +1,3 @@
-# ViziCities
+# ViziCities (0.3)
3D city and data visualisation platform
-
-[![Travis build status](http://img.shields.io/travis/vizicities/vizicities.svg?style=flat)](https://travis-ci.org/vizicities/vizicities)
-[![Code Climate](https://codeclimate.com/github/vizicities/vizicities/badges/gpa.svg)](https://codeclimate.com/github/vizicities/vizicities)
-[![Test Coverage](https://codeclimate.com/github/vizicities/vizicities/badges/coverage.svg)](https://codeclimate.com/github/vizicities/vizicities)
-[![Dependency Status](https://david-dm.org/vizicities/vizicities.svg)](https://david-dm.org/vizicities/vizicities)
-[![devDependency Status](https://david-dm.org/vizicities/vizicities/dev-status.svg)](https://david-dm.org/vizicities/vizicities#info=devDependencies)

0 comments on commit 792dc97

Please sign in to comment.