summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorMyles Borins <mborins@us.ibm.com>2016-06-02 17:22:53 -0700
committerMyles Borins <mborins@us.ibm.com>2016-06-03 16:17:59 -0700
commitedbb092cafd44252dd1d503f16ec6f32c79e7f60 (patch)
treec7f995c149c54618be8feb79ba5fbe46bc0a366a /LICENSE
parentd0151695a7a5504115dd3feb4ffac7557e9e31b2 (diff)
downloadandroid-node-v8-edbb092cafd44252dd1d503f16ec6f32c79e7f60.tar.gz
android-node-v8-edbb092cafd44252dd1d503f16ec6f32c79e7f60.tar.bz2
android-node-v8-edbb092cafd44252dd1d503f16ec6f32c79e7f60.zip
doc: update licenses
Update the licenses for both Marked and ESLint. Created using `tools/license-builder.sh` PR-URL: https://github.com/nodejs/node/pull/7121 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Rod Vagg <rod@vagg.org>
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE4
1 files changed, 2 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index d0d07f7d42..afe38dd748 100644
--- a/LICENSE
+++ b/LICENSE
@@ -970,7 +970,7 @@ The externally maintained libraries used by Node.js are:
- marked, located at tools/doc/node_modules/marked, is licensed as follows:
"""
- Copyright (c) 2011-2012, Christopher Jeffrey (https://github.com/chjj/)
+ Copyright (c) 2011-2014, Christopher Jeffrey (https://github.com/chjj/)
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -1025,7 +1025,7 @@ The externally maintained libraries used by Node.js are:
- ESLint, located at tools/eslint, is licensed as follows:
"""
ESLint
- Copyright (c) 2013 Nicholas C. Zakas. All rights reserved.
+ Copyright jQuery Foundation and other contributors, https://jquery.org/
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal