CVS commit: src/dist/file/doc

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

Module Name:    src
Committed By:   christos
Date:           Sat Aug 30 11:39:01 UTC 2008

Modified Files:
        src/dist/file/doc: Makefile.in file.1 libmagic.3 magic.5

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -r1.12 -r1.13 src/dist/file/doc/Makefile.in
cvs rdiff -r1.15 -r1.16 src/dist/file/doc/file.1 src/dist/file/doc/magic.5
cvs rdiff -r1.8 -r1.9 src/dist/file/doc/libmagic.3

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