summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2012-06-28 04:14:24 +0200
committerBen Noordhuis <info@bnoordhuis.nl>2012-06-28 04:14:43 +0200
commit2d0011f53256e7a1a707a6672772d36260f81691 (patch)
treea6d26e0bdaa27f24315f76de64cd8d90950cd393 /LICENSE
parente7e34ddb66f61d123f00a173e6a7b196d567c9d0 (diff)
downloadnodejs-2d0011f53256e7a1a707a6672772d36260f81691.tar.gz
nodejs-2d0011f53256e7a1a707a6672772d36260f81691.tar.bz2
nodejs-2d0011f53256e7a1a707a6672772d36260f81691.zip
Revert "tools: update closure_linter to the latest(2.3.5)"
This reverts commit 6d98524609d5c0a1445f71b9930ff81c48c749be. This reverts commit 60ff789618b5d61650609c7df27359ed3a609cc2. closure_linter now depends on the gflags module and not everyone will have that installed by default.
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE37
1 files changed, 26 insertions, 11 deletions
diff --git a/LICENSE b/LICENSE
index 3a273df1b..adc86f22a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -299,22 +299,37 @@ maintained libraries. The externally maintained libraries used by Node are:
IN THE SOFTWARE.
"""
-- Closure Linter is located at tools/closure_linter. Closure Linter's license
+- Closure Linter is located at tools/closure_linter. Closure's license
follows:
"""
- # Copyright 2010 The Closure Linter Authors. All Rights Reserved.
+ # Copyright (c) 2007, Google Inc.
+ # All rights reserved.
#
- # Licensed under the Apache License, Version 2.0 (the "License");
- # you may not use this file except in compliance with the License.
- # You may obtain a copy of the License at
+ # Redistribution and use in source and binary forms, with or without
+ # modification, are permitted provided that the following conditions are
+ # met:
#
- # http://www.apache.org/licenses/LICENSE-2.0
+ # * Redistributions of source code must retain the above copyright
+ # notice, this list of conditions and the following disclaimer.
+ # * 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.
+ # * Neither the name of Google Inc. nor the names of its
+ # contributors may be used to endorse or promote products derived from
+ # this software without specific prior written permission.
#
- # Unless required by applicable law or agreed to in writing, software
- # distributed under the License is distributed on an "AS-IS" BASIS,
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- # See the License for the specific language governing permissions and
- # limitations under the License.
+ # 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.
"""
- tools/cpplint.py is a C++ linter. Its license follows: