CVS commit: [yamt-pf42] src/dist/atf/atf

[YAMAMOTO Takashi <yamt%netbsd.org@localhost>]

Module Name:    src
Committed By:   yamt
Date:           Tue Jun 17 14:57:57 UTC 2008

Removed Files:
        src/dist/atf/atf [yamt-pf42]: application.cpp application.hpp
            atf-c++-api.3 atffile.cpp atffile.hpp config.cpp config.hpp env.cpp
            env.hpp exceptions.cpp exceptions.hpp expand.cpp expand.hpp
            formats.cpp formats.hpp fs.cpp fs.hpp io.cpp io.hpp macros.hpp
            parser.cpp parser.hpp sanity.cpp sanity.hpp signals.cpp signals.hpp
            tests.cpp tests.hpp text.cpp text.hpp ui.cpp ui.hpp user.cpp
            user.hpp utils.hpp

Log Message:
fix merge botches


To generate a diff of this commit:
cvs rdiff -r1.1.1.2 -r0 src/dist/atf/atf/application.cpp \
    src/dist/atf/atf/application.hpp src/dist/atf/atf/atffile.cpp \
    src/dist/atf/atf/config.cpp src/dist/atf/atf/exceptions.cpp \
    src/dist/atf/atf/exceptions.hpp src/dist/atf/atf/fs.cpp \
    src/dist/atf/atf/io.hpp src/dist/atf/atf/macros.hpp \
    src/dist/atf/atf/tests.cpp src/dist/atf/atf/tests.hpp \
    src/dist/atf/atf/text.hpp src/dist/atf/atf/ui.hpp \
    src/dist/atf/atf/user.cpp src/dist/atf/atf/user.hpp \
    src/dist/atf/atf/utils.hpp
cvs rdiff -r1.1.1.1 -r0 src/dist/atf/atf/atf-c++-api.3 \
    src/dist/atf/atf/atffile.hpp src/dist/atf/atf/config.hpp \
    src/dist/atf/atf/env.cpp src/dist/atf/atf/env.hpp \
    src/dist/atf/atf/expand.cpp src/dist/atf/atf/expand.hpp \
    src/dist/atf/atf/formats.cpp src/dist/atf/atf/formats.hpp \
    src/dist/atf/atf/fs.hpp src/dist/atf/atf/io.cpp \
    src/dist/atf/atf/parser.cpp src/dist/atf/atf/parser.hpp \
    src/dist/atf/atf/sanity.cpp src/dist/atf/atf/sanity.hpp \
    src/dist/atf/atf/signals.cpp src/dist/atf/atf/signals.hpp \
    src/dist/atf/atf/text.cpp src/dist/atf/atf/ui.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.