CVS commit: src/dist/bzip2

[Christos Zoulas <christos%netbsd.org@localhost>]

Module Name:    src
Committed By:   christos
Date:           Tue Mar 18 14:47:08 UTC 2008

Modified Files:
        src/dist/bzip2: bzip2.1 bzip2.c bzip2recover.c bzlib.c
Removed Files:
        src/dist/bzip2: Y2K_INFO manual.texi manual_1.html manual_2.html
            manual_3.html manual_4.html manual_abt.html manual_ovr.html
            manual_toc.html

Log Message:
merge conflicts


To generate a diff of this commit:
cvs rdiff -r1.1.1.1 -r0 src/dist/bzip2/Y2K_INFO \
    src/dist/bzip2/manual_abt.html src/dist/bzip2/manual_ovr.html
cvs rdiff -r1.2 -r1.3 src/dist/bzip2/bzip2.1
cvs rdiff -r1.4 -r1.5 src/dist/bzip2/bzip2.c
cvs rdiff -r1.5 -r1.6 src/dist/bzip2/bzip2recover.c
cvs rdiff -r1.3 -r1.4 src/dist/bzip2/bzlib.c
cvs rdiff -r1.1.1.2 -r0 src/dist/bzip2/manual.texi \
    src/dist/bzip2/manual_1.html src/dist/bzip2/manual_2.html \
    src/dist/bzip2/manual_3.html src/dist/bzip2/manual_4.html \
    src/dist/bzip2/manual_toc.html

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