Merge branches/quickjs to trunk. This is the way.

git-svn-id: https://www.unprompted.com/svn/projects/tildefriends/trunk@3621 ed5197a5-7fde-0310-b194-c3ffbd925b24
This commit is contained in:
2021-01-02 18:10:00 +00:00
parent d293637741
commit 79022e1e1f
703 changed files with 419987 additions and 30640 deletions

17
COPYING
View File

@ -16,13 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
Additional permission under GNU GPL version 3 section 7
If you modify this Program, or any covered work, by linking or combining it
with V8 (or a modified version of that library), containing parts covered by
the terms of the New BSD License, the licensors of this Program grant you
additional permission to convey the resulting work. {Corresponding Source for
a non-source form of such a combination shall include the source code for the
parts of V8 used as well as that of the covered work.}
If you modify this Program, or any covered work, by linking or combining it
with libuv (or a modified version of that library), containing parts covered by
the terms of the MIT License, the licensors of this Program grant you
@ -31,11 +24,11 @@ a non-source form of such a combination shall include the source code for the
parts of libuv used as well as that of the covered work.}
If you modify this Program, or any covered work, by linking or combining it
with liblmdb (or a modified version of that library), containing parts covered
by the terms of the OpenLDAP Public License, the licensors of this Program
grant you additional permission to convey the resulting work. {Corresponding
Source for a non-source form of such a combination shall include the source
code for the parts of liblmdb used as well as that of the covered work.}
with QuickJS (or a modified version of that library), containing parts covered
by the terms of the MIT License, the licensors of this Program grant you
additional permission to convey the resulting work. {Corresponding Source for
a non-source form of such a combination shall include the source code for the
parts of QuickJS used as well as that of the covered work.}
If you modify this Program, or any covered work, by linking or combining it
with javascript-bcrypt (or a modified version of that library), containing