Module Name: src
Committed By: jmmv
Date: Thu Mar 31 16:44:18 UTC 2011
Modified Files:
src/external/bsd/atf/dist/atf-run: atf-run.cpp
src/external/bsd/atf/dist/atf-sh: atf-check.cpp atf-check_test.sh
src/external/bsd/atf/dist/doc: atf-test-case.4
Log Message:
Fix import conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/dist/atf-run/atf-run.cpp
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/atf-sh/atf-check.cpp
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/atf-sh/atf-check_test.sh
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/doc/atf-test-case.4
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
