Module Name: src
Committed By: plunky
Date: Mon Mar 26 14:30:47 UTC 2012
Modified Files:
src/external/bsd/pcc/dist/pcc/cc/ccom: ccom.1 gcc_compat.c pass1.h
pftn.c
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.5 -r1.6 src/external/bsd/pcc/dist/pcc/cc/ccom/ccom.1
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/pcc/dist/pcc/cc/ccom/gcc_compat.c \
src/external/bsd/pcc/dist/pcc/cc/ccom/pass1.h
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/pcc/dist/pcc/cc/ccom/pftn.c
cvs rdiff -u -r1.4 -r1.5 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.
