---
- branch: MAIN
  date: Sun Apr 16 20:46:18 UTC 2023
  files:
  - new: '1.37'
    old: '1.36'
    path: src/distrib/sets/lists/base/ad.aarch64
    pathrev: src/distrib/sets/lists/base/ad.aarch64@1.37
    type: modified
  - new: '1.1315'
    old: '1.1314'
    path: src/distrib/sets/lists/base/mi
    pathrev: src/distrib/sets/lists/base/mi@1.1315
    type: modified
  - new: '1.947'
    old: '1.946'
    path: src/distrib/sets/lists/base/shl.mi
    pathrev: src/distrib/sets/lists/base/shl.mi@1.947
    type: modified
  - new: '1.304'
    old: '1.303'
    path: src/distrib/sets/lists/debug/shl.mi
    pathrev: src/distrib/sets/lists/debug/shl.mi@1.304
    type: modified
  - new: '1.1920'
    old: '1.1919'
    path: src/doc/3RDPARTY
    pathrev: src/doc/3RDPARTY@1.1920
    type: modified
  - new: '1.2959'
    old: '1.2958'
    path: src/doc/CHANGES
    pathrev: src/doc/CHANGES@1.2959
    type: modified
  - new: '1.247'
    old: '1.246'
    path: src/etc/mtree/NetBSD.dist.base
    pathrev: src/etc/mtree/NetBSD.dist.base@1.247
    type: modified
  - new: '1.2'
    old: '1.1'
    path: src/etc/mtree/NetBSD.dist.compat.in
    pathrev: src/etc/mtree/NetBSD.dist.compat.in@1.2
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/external/mit/lua/dist/Makefile
    pathrev: src/external/mit/lua/dist/Makefile@1.8
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/external/mit/lua/dist/README
    pathrev: src/external/mit/lua/dist/README@1.9
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/mit/lua/dist/README.import
    pathrev: src/external/mit/lua/dist/README.import@1.3
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/external/mit/lua/dist/doc/contents.html
    pathrev: src/external/mit/lua/dist/doc/contents.html@1.8
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/external/mit/lua/dist/doc/lua.1
    pathrev: src/external/mit/lua/dist/doc/lua.1@1.8
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/external/mit/lua/dist/doc/readme.html
    pathrev: src/external/mit/lua/dist/doc/readme.html@1.8
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/external/mit/lua/dist/doc/manual.html
    pathrev: src/external/mit/lua/dist/doc/manual.html@1.9
    type: modified
  - new: '1.6'
    old: '1.5'
    path: src/external/mit/lua/dist/src/Makefile
    pathrev: src/external/mit/lua/dist/src/Makefile@1.6
    type: modified
  - new: '1.13'
    old: '1.12'
    path: src/external/mit/lua/dist/src/lapi.c
    pathrev: src/external/mit/lua/dist/src/lapi.c@1.13
    type: modified
  - new: '1.13'
    old: '1.12'
    path: src/external/mit/lua/dist/src/llex.c
    pathrev: src/external/mit/lua/dist/src/llex.c@1.13
    type: modified
  - new: '1.13'
    old: '1.12'
    path: src/external/mit/lua/dist/src/lobject.c
    pathrev: src/external/mit/lua/dist/src/lobject.c@1.13
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/external/mit/lua/dist/src/lapi.h
    pathrev: src/external/mit/lua/dist/src/lapi.h@1.10
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/external/mit/lua/dist/src/ldebug.h
    pathrev: src/external/mit/lua/dist/src/ldebug.h@1.10
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/external/mit/lua/dist/src/ldo.c
    pathrev: src/external/mit/lua/dist/src/ldo.c@1.10
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/external/mit/lua/dist/src/ldo.h
    pathrev: src/external/mit/lua/dist/src/ldo.h@1.10
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/external/mit/lua/dist/src/ldump.c
    pathrev: src/external/mit/lua/dist/src/ldump.c@1.10
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/external/mit/lua/dist/src/linit.c
    pathrev: src/external/mit/lua/dist/src/linit.c@1.10
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/external/mit/lua/dist/src/liolib.c
    pathrev: src/external/mit/lua/dist/src/liolib.c@1.10
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/external/mit/lua/dist/src/lmathlib.c
    pathrev: src/external/mit/lua/dist/src/lmathlib.c@1.10
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/external/mit/lua/dist/src/lmem.c
    pathrev: src/external/mit/lua/dist/src/lmem.c@1.10
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/external/mit/lua/dist/src/loadlib.c
    pathrev: src/external/mit/lua/dist/src/loadlib.c@1.10
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/external/mit/lua/dist/src/lstate.c
    pathrev: src/external/mit/lua/dist/src/lstate.c@1.10
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/external/mit/lua/dist/src/lstate.h
    pathrev: src/external/mit/lua/dist/src/lstate.h@1.10
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/external/mit/lua/dist/src/lstring.c
    pathrev: src/external/mit/lua/dist/src/lstring.c@1.10
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/external/mit/lua/dist/src/lstring.h
    pathrev: src/external/mit/lua/dist/src/lstring.h@1.10
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/external/mit/lua/dist/src/ltablib.c
    pathrev: src/external/mit/lua/dist/src/ltablib.c@1.10
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/external/mit/lua/dist/src/ltm.c
    pathrev: src/external/mit/lua/dist/src/ltm.c@1.10
    type: modified
  - new: '1.10'
    old: '1.9'
    path: src/external/mit/lua/dist/src/lua.c
    pathrev: src/external/mit/lua/dist/src/lua.c@1.10
    type: modified
  - new: '1.12'
    old: '1.11'
    path: src/external/mit/lua/dist/src/lauxlib.c
    pathrev: src/external/mit/lua/dist/src/lauxlib.c@1.12
    type: modified
  - new: '1.12'
    old: '1.11'
    path: src/external/mit/lua/dist/src/lcode.c
    pathrev: src/external/mit/lua/dist/src/lcode.c@1.12
    type: modified
  - new: '1.12'
    old: '1.11'
    path: src/external/mit/lua/dist/src/ldblib.c
    pathrev: src/external/mit/lua/dist/src/ldblib.c@1.12
    type: modified
  - new: '1.12'
    old: '1.11'
    path: src/external/mit/lua/dist/src/ldebug.c
    pathrev: src/external/mit/lua/dist/src/ldebug.c@1.12
    type: modified
  - new: '1.12'
    old: '1.11'
    path: src/external/mit/lua/dist/src/loslib.c
    pathrev: src/external/mit/lua/dist/src/loslib.c@1.12
    type: modified
  - new: '1.12'
    old: '1.11'
    path: src/external/mit/lua/dist/src/lparser.c
    pathrev: src/external/mit/lua/dist/src/lparser.c@1.12
    type: modified
  - new: '1.12'
    old: '1.11'
    path: src/external/mit/lua/dist/src/ltable.c
    pathrev: src/external/mit/lua/dist/src/ltable.c@1.12
    type: modified
  - new: '1.12'
    old: '1.11'
    path: src/external/mit/lua/dist/src/lua.h
    pathrev: src/external/mit/lua/dist/src/lua.h@1.12
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/external/mit/lua/dist/src/lauxlib.h
    pathrev: src/external/mit/lua/dist/src/lauxlib.h@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/external/mit/lua/dist/src/lcode.h
    pathrev: src/external/mit/lua/dist/src/lcode.h@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/external/mit/lua/dist/src/lfunc.c
    pathrev: src/external/mit/lua/dist/src/lfunc.c@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/external/mit/lua/dist/src/lfunc.h
    pathrev: src/external/mit/lua/dist/src/lfunc.h@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/external/mit/lua/dist/src/lgc.h
    pathrev: src/external/mit/lua/dist/src/lgc.h@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/external/mit/lua/dist/src/llex.h
    pathrev: src/external/mit/lua/dist/src/llex.h@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/external/mit/lua/dist/src/lmem.h
    pathrev: src/external/mit/lua/dist/src/lmem.h@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/external/mit/lua/dist/src/lopcodes.c
    pathrev: src/external/mit/lua/dist/src/lopcodes.c@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/external/mit/lua/dist/src/lopcodes.h
    pathrev: src/external/mit/lua/dist/src/lopcodes.h@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/external/mit/lua/dist/src/lparser.h
    pathrev: src/external/mit/lua/dist/src/lparser.h@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/external/mit/lua/dist/src/ltable.h
    pathrev: src/external/mit/lua/dist/src/ltable.h@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/external/mit/lua/dist/src/ltm.h
    pathrev: src/external/mit/lua/dist/src/ltm.h@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/external/mit/lua/dist/src/lundump.c
    pathrev: src/external/mit/lua/dist/src/lundump.c@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/external/mit/lua/dist/src/lutf8lib.c
    pathrev: src/external/mit/lua/dist/src/lutf8lib.c@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/external/mit/lua/dist/src/lzio.c
    pathrev: src/external/mit/lua/dist/src/lzio.c@1.9
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/external/mit/lua/dist/src/lzio.h
    pathrev: src/external/mit/lua/dist/src/lzio.h@1.9
    type: modified
  - new: '1.11'
    old: '1.10'
    path: src/external/mit/lua/dist/src/lbaselib.c
    pathrev: src/external/mit/lua/dist/src/lbaselib.c@1.11
    type: modified
  - new: '1.11'
    old: '1.10'
    path: src/external/mit/lua/dist/src/lgc.c
    pathrev: src/external/mit/lua/dist/src/lgc.c@1.11
    type: modified
  - new: '1.11'
    old: '1.10'
    path: src/external/mit/lua/dist/src/llimits.h
    pathrev: src/external/mit/lua/dist/src/llimits.h@1.11
    type: modified
  - new: '1.11'
    old: '1.10'
    path: src/external/mit/lua/dist/src/lobject.h
    pathrev: src/external/mit/lua/dist/src/lobject.h@1.11
    type: modified
  - new: '1.11'
    old: '1.10'
    path: src/external/mit/lua/dist/src/luac.c
    pathrev: src/external/mit/lua/dist/src/luac.c@1.11
    type: modified
  - new: '1.11'
    old: '1.10'
    path: src/external/mit/lua/dist/src/lvm.h
    pathrev: src/external/mit/lua/dist/src/lvm.h@1.11
    type: modified
  - new: '0'
    old: '1.7'
    path: src/external/mit/lua/dist/src/lbitlib.c
    pathrev: src/external/mit/lua/dist/src/lbitlib.c@0
    type: deleted
  - new: '1.8'
    old: '1.7'
    path: src/external/mit/lua/dist/src/lcorolib.c
    pathrev: src/external/mit/lua/dist/src/lcorolib.c@1.8
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/external/mit/lua/dist/src/lctype.c
    pathrev: src/external/mit/lua/dist/src/lctype.c@1.8
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/external/mit/lua/dist/src/lctype.h
    pathrev: src/external/mit/lua/dist/src/lctype.h@1.8
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/external/mit/lua/dist/src/lprefix.h
    pathrev: src/external/mit/lua/dist/src/lprefix.h@1.8
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/external/mit/lua/dist/src/lualib.h
    pathrev: src/external/mit/lua/dist/src/lualib.h@1.8
    type: modified
  - new: '1.8'
    old: '1.7'
    path: src/external/mit/lua/dist/src/lundump.h
    pathrev: src/external/mit/lua/dist/src/lundump.h@1.8
    type: modified
  - new: '1.2'
    old: 1.1.1.1
    path: src/external/mit/lua/dist/src/ljumptab.h
    pathrev: src/external/mit/lua/dist/src/ljumptab.h@1.2
    type: modified
  - new: '1.19'
    old: '1.18'
    path: src/external/mit/lua/dist/src/lstrlib.c
    pathrev: src/external/mit/lua/dist/src/lstrlib.c@1.19
    type: modified
  - new: '1.24'
    old: '1.23'
    path: src/external/mit/lua/dist/src/luaconf.h
    pathrev: src/external/mit/lua/dist/src/luaconf.h@1.24
    type: modified
  - new: '1.15'
    old: '1.14'
    path: src/external/mit/lua/dist/src/lvm.c
    pathrev: src/external/mit/lua/dist/src/lvm.c@1.15
    type: modified
  - new: '1.12'
    old: '1.11'
    path: src/external/mit/lua/lib/liblua/Makefile
    pathrev: src/external/mit/lua/lib/liblua/Makefile@1.12
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/external/mit/lua/lib/liblua/shlib_version
    pathrev: src/external/mit/lua/lib/liblua/shlib_version@1.3
    type: modified
  - new: '1.9'
    old: '1.8'
    path: src/share/mk/bsd.lua.mk
    pathrev: src/share/mk/bsd.lua.mk@1.9
    type: modified
  - new: '1.3'
    old: '1.2'
    path: src/sys/modules/examples/luahello/luahello.lua
    pathrev: src/sys/modules/examples/luahello/luahello.lua@1.3
    type: modified
  - new: '1.13'
    old: '1.12'
    path: src/sys/modules/lua/Makefile
    pathrev: src/sys/modules/lua/Makefile@1.13
    type: modified
  id: 20230416T204618Z.b7c8f60974c2b55b78e274f3ee6c3e8ec8a6307e
  log: |
    Resolve conflicts for lua 5.4.4 import.
    Adjust various files for lua 5.4.4.
  module: src
  subject: 'CVS commit: src'
  unixtime: '1681677978'
  user: nikita