CVS commit: src/external/bsd/pcc/dist/pcc

["Iain Hibbert" <plunky%netbsd.org@localhost>]

Module Name:    src
Committed By:   plunky
Date:           Wed Jan 11 20:46:48 UTC 2012

Modified Files:
        src/external/bsd/pcc/dist/pcc: configure.ac
        src/external/bsd/pcc/dist/pcc/cc: Makefile.in
        src/external/bsd/pcc/dist/pcc/cc/cc: cc.1
        src/external/bsd/pcc/dist/pcc/cc/ccom: ccom.1 scan.l
        src/external/bsd/pcc/dist/pcc/mip: common.c

Log Message:
resolve merge conflicts


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pcc/dist/pcc/configure.ac
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pcc/dist/pcc/cc/Makefile.in
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pcc/dist/pcc/cc/cc/cc.1
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/pcc/dist/pcc/cc/ccom/ccom.1
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pcc/dist/pcc/cc/ccom/scan.l
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/pcc/dist/pcc/mip/common.c

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