Skip to content

Commit

Permalink
Remove some outdated stuff from NOTICE and LICENSE
Browse files Browse the repository at this point in the history
  • Loading branch information
tilgovi committed Jul 31, 2015
1 parent 051116e commit 4633654
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 65 deletions.
57 changes: 0 additions & 57 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -119,41 +119,6 @@ For the jquery.mousewheel.js subcomponent:
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

For the jschannel subcomponent:

Version: MPL 1.1/GPL 2.0/LGPL 2.1

The contents of this file are subject to the Mozilla Public License Version
1.1 (the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at
http://www.mozilla.org/MPL/

Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the specific language governing rights and limitations under the
License.

The Original Code is jschannel.

The Initial Developer of the Original Code is Lloyd Hilaiel.

Portions created by the Initial Developer are Copyright (C) 2010
the Initial Developer. All Rights Reserved.

Contributor(s):

Alternatively, the contents of this file may be used under the terms of
either the GNU General Public License Version 2 or later (the "GPL"), or
the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
in which case the provisions of the GPL or the LGPL are applicable instead
of those above. If you wish to allow use of your version of this file only
under the terms of either the GPL or the LGPL, and not to allow others to
use your version of this file under the terms of the MPL, indicate your
decision by deleting the provisions above and replace them with the notice
and other provisions required by the GPL or the LGPL. If you do not delete
the provisions above, a recipient may use your version of this file under
the terms of any one of the MPL, the GPL or the LGPL.

For the jwz.js subcomponent:

Copyright (c) 2011 Frederik Dietz & Max Ogden
Expand All @@ -179,28 +144,6 @@ For the jwz.js subcomponent:
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.

For the sockjs subcomponent:

Copyright (c) 2011-2012 VMware, Inc.

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.

For the PageDown subcomponent:

The MIT License (MIT)
Expand Down
8 changes: 0 additions & 8 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,6 @@ This product also includes the following third-party components:

Copyright 2013 jQuery Foundation and other contributors

* jschannel (https://github.com/mozilla/jschannel)

Copyright (C) 2010, Lloyd Hilaiel

* sockjs (https://github.com/sockjs)

Copyright (c) 2011-2012 VMware, Inc.

* Gentleface icon set (http://www.gentleface.com/free_icon_set.html)

Copyright © 2006-2012 Gentleface
Expand Down

0 comments on commit 4633654

Please sign in to comment.