Module Name: src Committed By: christos Date: Sat Jun 17 22:05:21 UTC 2017
Modified Files: src/external/mit/expat/dist/lib: xmlparse.c xmltok.c src/external/mit/expat/dist/tests: xmltest.sh Removed Files: src/external/mit/expat/dist: configure.in expat.dsw src/external/mit/expat/dist/amiga: Makefile README.txt expat.xml expat_68k.c expat_68k.h expat_68k_handler_stubs.c expat_base.h expat_lib.c expat_vectors.c launch.c src/external/mit/expat/dist/amiga/include/inline4: expat.h src/external/mit/expat/dist/amiga/include/interfaces: expat.h src/external/mit/expat/dist/amiga/include/libraries: expat.h src/external/mit/expat/dist/amiga/include/proto: expat.h src/external/mit/expat/dist/bcb5: README.txt all_projects.bpg elements.bpf elements.bpr elements.mak expat.bpf expat.bpr expat.mak expat_static.bpf expat_static.bpr expat_static.mak expatw.bpf expatw.bpr expatw.mak expatw_static.bpf expatw_static.bpr expatw_static.mak libexpat_mtd.def libexpatw_mtd.def makefile.mak outline.bpf outline.bpr outline.mak setup.bat xmlwf.bpf xmlwf.bpr xmlwf.mak src/external/mit/expat/dist/examples: elements.dsp outline.dsp src/external/mit/expat/dist/lib: Makefile.MPW amigaconfig.h expat.dsp expat_static.dsp expatw.dsp expatw_static.dsp macconfig.h src/external/mit/expat/dist/tests/benchmark: benchmark.dsp benchmark.dsw src/external/mit/expat/dist/vms: README.vms descrip.mms expat_config.h src/external/mit/expat/dist/xmlwf: xmlwf.dsp Log Message: merge conflicts To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 src/external/mit/expat/dist/configure.in cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/expat/dist/expat.dsw cvs rdiff -u -r1.1.1.2 -r0 src/external/mit/expat/dist/amiga/Makefile \ src/external/mit/expat/dist/amiga/README.txt \ src/external/mit/expat/dist/amiga/expat_lib.c \ src/external/mit/expat/dist/amiga/expat_vectors.c \ src/external/mit/expat/dist/amiga/launch.c cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/expat/dist/amiga/expat.xml \ src/external/mit/expat/dist/amiga/expat_68k.c \ src/external/mit/expat/dist/amiga/expat_68k.h \ src/external/mit/expat/dist/amiga/expat_68k_handler_stubs.c \ src/external/mit/expat/dist/amiga/expat_base.h cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/expat/dist/amiga/include/inline4/expat.h cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/expat/dist/amiga/include/interfaces/expat.h cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/expat/dist/amiga/include/libraries/expat.h cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/expat/dist/amiga/include/proto/expat.h cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/expat/dist/bcb5/README.txt \ src/external/mit/expat/dist/bcb5/all_projects.bpg \ src/external/mit/expat/dist/bcb5/elements.bpf \ src/external/mit/expat/dist/bcb5/elements.mak \ src/external/mit/expat/dist/bcb5/expat.bpf \ src/external/mit/expat/dist/bcb5/expat_static.bpf \ src/external/mit/expat/dist/bcb5/expatw.bpf \ src/external/mit/expat/dist/bcb5/expatw_static.bpf \ src/external/mit/expat/dist/bcb5/libexpat_mtd.def \ src/external/mit/expat/dist/bcb5/libexpatw_mtd.def \ src/external/mit/expat/dist/bcb5/makefile.mak \ src/external/mit/expat/dist/bcb5/outline.bpf \ src/external/mit/expat/dist/bcb5/outline.mak \ src/external/mit/expat/dist/bcb5/setup.bat \ src/external/mit/expat/dist/bcb5/xmlwf.bpf cvs rdiff -u -r1.1.1.2 -r0 src/external/mit/expat/dist/bcb5/elements.bpr \ src/external/mit/expat/dist/bcb5/expat.mak \ src/external/mit/expat/dist/bcb5/expat_static.mak \ src/external/mit/expat/dist/bcb5/expatw.mak \ src/external/mit/expat/dist/bcb5/expatw_static.mak \ src/external/mit/expat/dist/bcb5/outline.bpr \ src/external/mit/expat/dist/bcb5/xmlwf.mak cvs rdiff -u -r1.1.1.3 -r0 src/external/mit/expat/dist/bcb5/expat.bpr \ src/external/mit/expat/dist/bcb5/expat_static.bpr \ src/external/mit/expat/dist/bcb5/expatw.bpr \ src/external/mit/expat/dist/bcb5/expatw_static.bpr \ src/external/mit/expat/dist/bcb5/xmlwf.bpr cvs rdiff -u -r1.1.1.2 -r0 src/external/mit/expat/dist/examples/elements.dsp \ src/external/mit/expat/dist/examples/outline.dsp cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/expat/dist/lib/Makefile.MPW \ src/external/mit/expat/dist/lib/macconfig.h cvs rdiff -u -r1.1.1.2 -r0 src/external/mit/expat/dist/lib/amigaconfig.h \ src/external/mit/expat/dist/lib/expatw_static.dsp cvs rdiff -u -r1.1.1.3 -r0 src/external/mit/expat/dist/lib/expat.dsp \ src/external/mit/expat/dist/lib/expat_static.dsp \ src/external/mit/expat/dist/lib/expatw.dsp cvs rdiff -u -r1.6 -r1.7 src/external/mit/expat/dist/lib/xmlparse.c cvs rdiff -u -r1.3 -r1.4 src/external/mit/expat/dist/lib/xmltok.c cvs rdiff -u -r1.2 -r1.3 src/external/mit/expat/dist/tests/xmltest.sh cvs rdiff -u -r1.1.1.2 -r0 \ src/external/mit/expat/dist/tests/benchmark/benchmark.dsp cvs rdiff -u -r1.1.1.1 -r0 \ src/external/mit/expat/dist/tests/benchmark/benchmark.dsw cvs rdiff -u -r1.1.1.1 -r0 src/external/mit/expat/dist/vms/README.vms \ src/external/mit/expat/dist/vms/descrip.mms \ src/external/mit/expat/dist/vms/expat_config.h cvs rdiff -u -r1.1.1.3 -r0 src/external/mit/expat/dist/xmlwf/xmlwf.dsp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.