Module Name: src Committed By: christos Date: Sun Aug 2 20:25:55 UTC 2020
Modified Files: src/sys/external/bsd/acpica/dist/compiler: aslcompiler.l aslerror.c aslload.c aslxref.c src/sys/external/bsd/acpica/dist/debugger: dbdisply.c src/sys/external/bsd/acpica/dist/include: acpixf.h actypes.h src/sys/external/bsd/acpica/dist/os_specific/service_layers: oslinuxtbl.c src/sys/external/bsd/acpica/dist/utilities: utdecode.c utdelete.c Removed Files: src/sys/external/bsd/acpica/dist/generate/unix/acpinames: Makefile src/sys/external/bsd/acpica/dist/tools/acpinames: acpinames.h anmain.c anstubs.c antables.c Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 \ src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l cvs rdiff -u -r1.15 -r1.16 \ src/sys/external/bsd/acpica/dist/compiler/aslerror.c cvs rdiff -u -r1.18 -r1.19 \ src/sys/external/bsd/acpica/dist/compiler/aslload.c \ src/sys/external/bsd/acpica/dist/compiler/aslxref.c cvs rdiff -u -r1.17 -r1.18 \ src/sys/external/bsd/acpica/dist/debugger/dbdisply.c cvs rdiff -u -r1.1.1.10 -r0 \ src/sys/external/bsd/acpica/dist/generate/unix/acpinames/Makefile cvs rdiff -u -r1.26 -r1.27 src/sys/external/bsd/acpica/dist/include/acpixf.h cvs rdiff -u -r1.21 -r1.22 src/sys/external/bsd/acpica/dist/include/actypes.h cvs rdiff -u -r1.11 -r1.12 \ src/sys/external/bsd/acpica/dist/os_specific/service_layers/oslinuxtbl.c cvs rdiff -u -r1.1.1.9 -r0 \ src/sys/external/bsd/acpica/dist/tools/acpinames/acpinames.h cvs rdiff -u -r1.1.1.13 -r0 \ src/sys/external/bsd/acpica/dist/tools/acpinames/anmain.c \ src/sys/external/bsd/acpica/dist/tools/acpinames/anstubs.c cvs rdiff -u -r1.1.1.10 -r0 \ src/sys/external/bsd/acpica/dist/tools/acpinames/antables.c cvs rdiff -u -r1.16 -r1.17 \ src/sys/external/bsd/acpica/dist/utilities/utdecode.c cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/acpica/dist/utilities/utdelete.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.