Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E3B4984E83 for ; Thu, 8 Jun 2023 21:12:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id wzQDj7MqXA24 for ; Thu, 8 Jun 2023 21:12:09 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 4B4A184CFD for ; Thu, 8 Jun 2023 21:12:09 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 43956FA89; Thu, 8 Jun 2023 21:12:09 +0000 (UTC) Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" MIME-Version: 1.0 Date: Thu, 8 Jun 2023 21:12:09 +0000 From: "nikita" Subject: CVS commit: src/external/mit/lua To: source-changes@NetBSD.org Approved: for-source-only Reply-To: nikita@netbsd.org X-Mailer: log_accum Message-Id: <20230608211209.43956FA89@cvs.NetBSD.org> Module Name: src Committed By: nikita Date: Thu Jun 8 21:12:08 UTC 2023 Modified Files: src/external/mit/lua/dist: Makefile README README.import src/external/mit/lua/dist/doc: contents.html lua.1 manual.html readme.html src/external/mit/lua/dist/src: Makefile lapi.c lapi.h lauxlib.c lcode.c lcorolib.c ldebug.c ldebug.h ldo.c ldo.h ldump.c lfunc.c lfunc.h lgc.c lgc.h llex.c llimits.h lmathlib.c lmem.c loadlib.c lobject.c lobject.h lopcodes.h loslib.c lparser.c lstate.c lstate.h lstrlib.c ltable.c ltable.h ltablib.c ltm.c ltm.h lua.c lua.h luac.c luaconf.h lundump.c lutf8lib.c lvm.c lvm.h src/external/mit/lua/lib/liblua: shlib_version Log Message: lua: resolve import conflicts To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/mit/lua/dist/Makefile cvs rdiff -u -r1.9 -r1.10 src/external/mit/lua/dist/README cvs rdiff -u -r1.4 -r1.5 src/external/mit/lua/dist/README.import cvs rdiff -u -r1.8 -r1.9 src/external/mit/lua/dist/doc/contents.html \ src/external/mit/lua/dist/doc/lua.1 \ src/external/mit/lua/dist/doc/readme.html cvs rdiff -u -r1.9 -r1.10 src/external/mit/lua/dist/doc/manual.html cvs rdiff -u -r1.6 -r1.7 src/external/mit/lua/dist/src/Makefile cvs rdiff -u -r1.14 -r1.15 src/external/mit/lua/dist/src/lapi.c \ src/external/mit/lua/dist/src/lparser.c cvs rdiff -u -r1.10 -r1.11 src/external/mit/lua/dist/src/lapi.h \ src/external/mit/lua/dist/src/ldebug.h \ src/external/mit/lua/dist/src/lfunc.c \ src/external/mit/lua/dist/src/lfunc.h \ src/external/mit/lua/dist/src/lmathlib.c \ src/external/mit/lua/dist/src/lmem.c \ src/external/mit/lua/dist/src/loadlib.c \ src/external/mit/lua/dist/src/lstate.h \ src/external/mit/lua/dist/src/ltablib.c \ src/external/mit/lua/dist/src/ltm.c \ src/external/mit/lua/dist/src/lundump.c \ src/external/mit/lua/dist/src/lutf8lib.c cvs rdiff -u -r1.12 -r1.13 src/external/mit/lua/dist/src/lauxlib.c \ src/external/mit/lua/dist/src/lgc.c \ src/external/mit/lua/dist/src/loslib.c \ src/external/mit/lua/dist/src/ltable.c cvs rdiff -u -r1.13 -r1.14 src/external/mit/lua/dist/src/lcode.c \ src/external/mit/lua/dist/src/ldebug.c \ src/external/mit/lua/dist/src/llex.c \ src/external/mit/lua/dist/src/lobject.c \ src/external/mit/lua/dist/src/lua.h cvs rdiff -u -r1.9 -r1.10 src/external/mit/lua/dist/src/lcorolib.c \ src/external/mit/lua/dist/src/lgc.h \ src/external/mit/lua/dist/src/lopcodes.h \ src/external/mit/lua/dist/src/ltable.h \ src/external/mit/lua/dist/src/ltm.h cvs rdiff -u -r1.11 -r1.12 src/external/mit/lua/dist/src/ldo.c \ src/external/mit/lua/dist/src/ldo.h src/external/mit/lua/dist/src/ldump.c \ src/external/mit/lua/dist/src/llimits.h \ src/external/mit/lua/dist/src/lobject.h \ src/external/mit/lua/dist/src/lstate.c \ src/external/mit/lua/dist/src/lua.c src/external/mit/lua/dist/src/luac.c \ src/external/mit/lua/dist/src/lvm.h cvs rdiff -u -r1.20 -r1.21 src/external/mit/lua/dist/src/lstrlib.c cvs rdiff -u -r1.24 -r1.25 src/external/mit/lua/dist/src/luaconf.h cvs rdiff -u -r1.19 -r1.20 src/external/mit/lua/dist/src/lvm.c cvs rdiff -u -r1.3 -r1.4 src/external/mit/lua/lib/liblua/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.