CVSROOT: /cvs
Module name: src
Changes by: m...@cvs.openbsd.org 2012/11/28 13:46:16
Modified files:
gnu/usr.bin/gcc: Makefile.bsd-wrapper
gnu/usr.bin/gcc/gcc: combine.c configure expr.c function.c
reload1.c rtl.h unwind-dw2.c version.c
gnu/usr.bin/gcc/gcc/config/alpha: alpha.c alpha.h alpha.md
gnu/usr.bin/gcc/gcc/config/i386: i386-protos.h i386.c i386.h
gnu/usr.bin/gcc/gcc/config/mips: mips.c mips.h mips.md
gnu/usr.bin/gcc/gcc/config/rs6000: rs6000.c
gnu/usr.bin/gcc/gcc/config/sparc: sparc.c sparc.md
gnu/usr.bin/gcc/gcc/cp: call.c
gnu/usr.bin/gcc/gcc/doc: invoke.texi
Log message:
merge conflicts
