Skip to content

Commit

Permalink
Miscommunication in folder modifications on main repo vs. clone.
Browse files Browse the repository at this point in the history
Revert "license updated"

This reverts commit 8eb2f24.
  • Loading branch information
skawtus authored and skawtus committed Mar 15, 2012
1 parent 07bfdb8 commit 24edbb3
Showing 1 changed file with 8 additions and 14 deletions.
22 changes: 8 additions & 14 deletions matlab/html/license.html
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,17 @@
<div class="header"><h1 class="code">License statement</h1></div>
<div class="text">
<p>
Copyright 2006-2011 University of Amsterdam, Jurriaan H. Spaaks & Scott L. Davis <br>
Copyright (c) 2012, Scott L. Davis <br>
All rights reserved.<br>
copyright 2006-2008 University of Amsterdam, Jurriaan H. Spaaks & Scott L. Davis
</p>
<p>
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
<br>
<font size=-1>
<ul>
<li>Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.</li>
<br>
<li>Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and&#47;or other materials provided with the distribution.</li>
</ul>
</font>
<br>
The GoogleEarth Toolbox for MATLAB is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
</p>
<p>

The GoogleEarth Toolbox for MATLAB is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
</p>
<p>
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.
You should have received a copy of the GNU General Public License along with The GoogleEarth Toolbox for MATLAB (<a href="matlab:web(fullfile(googleearthroot,'html','gpl.txt'),'-helpbrowser')">link</a>). If not, see <a href="matlab:openInBrowser('http://www.gnu.org/licenses/')">http://www.gnu.org/licenses/</a>.
</p>

</div>
Expand Down

0 comments on commit 24edbb3

Please sign in to comment.