Module Name: src Committed By: jmmv Date: Fri Jun 4 08:32:15 UTC 2010
Modified Files: src/external/bsd/atf/dist/atf-c: dynstr.c fs.c tc.c src/external/bsd/atf/dist/atf-version: atf-version.cpp Removed Files: src/external/bsd/atf/dist/atf-c: object.c object.h src/external/bsd/atf/dist/atf-compile: atf-compile.1 atf-compile.cpp atf-host-compile.sh src/external/bsd/atf/dist/atf-run: atf-run.hooks src/external/bsd/atf/dist/atf-sh: atf.footer.subr atf.header.subr atf.init.subr src/external/bsd/atf/dist/data: atf-c++.pc.in atf-c.pc.in atf-run.hooks tests-results.css tests-results.dtd tests-results.xsl src/external/bsd/atf/dist/doc: roadmap.xml src/external/bsd/atf/dist/doc/standalone: roadmap.html src/external/bsd/atf/dist/doc/text: roadmap.txt src/external/bsd/atf/dist/tests/atf/atf-c: d_include_object_h.c src/external/bsd/atf/dist/tests/atf/atf-compile: Atffile h_mode.cpp t_integration.sh src/external/bsd/atf/dist/tests/atf/data: Atffile t_pkg_config.sh Log Message: Fix import conflicts for atf 0.9. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/atf-c/dynstr.c \ src/external/bsd/atf/dist/atf-c/fs.c cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/atf-c/object.c \ src/external/bsd/atf/dist/atf-c/object.h cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/atf-c/tc.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/atf/dist/atf-compile/atf-compile.1 \ src/external/bsd/atf/dist/atf-compile/atf-compile.cpp \ src/external/bsd/atf/dist/atf-compile/atf-host-compile.sh cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/atf-run/atf-run.hooks cvs rdiff -u -r1.2 -r0 src/external/bsd/atf/dist/atf-sh/atf.footer.subr cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/atf-sh/atf.header.subr \ src/external/bsd/atf/dist/atf-sh/atf.init.subr cvs rdiff -u -r1.2 -r1.3 \ src/external/bsd/atf/dist/atf-version/atf-version.cpp cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/data/atf-c++.pc.in \ src/external/bsd/atf/dist/data/atf-c.pc.in \ src/external/bsd/atf/dist/data/atf-run.hooks \ src/external/bsd/atf/dist/data/tests-results.css \ src/external/bsd/atf/dist/data/tests-results.dtd \ src/external/bsd/atf/dist/data/tests-results.xsl cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/doc/roadmap.xml cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/atf/dist/doc/standalone/roadmap.html cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/doc/text/roadmap.txt cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/atf/dist/tests/atf/atf-c/d_include_object_h.c cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/atf/dist/tests/atf/atf-compile/Atffile \ src/external/bsd/atf/dist/tests/atf/atf-compile/h_mode.cpp \ src/external/bsd/atf/dist/tests/atf/atf-compile/t_integration.sh cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/tests/atf/data/Atffile cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/atf/dist/tests/atf/data/t_pkg_config.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.