Module Name: src
Committed By: tron
Date: Sun Feb 19 17:49:09 UTC 2012
Modified Files:
src/external/bsd/pkg_install/dist/lib: license.c pkg_summary.5
version.h
Log Message:
Resolve conflicts from last import.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pkg_install/dist/lib/license.c
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pkg_install/dist/lib/pkg_summary.5
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/pkg_install/dist/lib/version.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
