diff options
author | obrien <obrien@FreeBSD.org> | 1999-10-26 08:57:00 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 1999-10-26 08:57:00 +0000 |
commit | d169fbae437f9cfb29fa82819ce2ecd1f8c7e787 (patch) | |
tree | a1222e61d20649b46ecc9debd796cf283daad1c6 | |
parent | be3662861fdbfc06ea98220c857df5f4b5fe424c (diff) | |
download | FreeBSD-src-d169fbae437f9cfb29fa82819ce2ecd1f8c7e787.zip FreeBSD-src-d169fbae437f9cfb29fa82819ce2ecd1f8c7e787.tar.gz |
Fix conflicts.
-rw-r--r-- | contrib/gcc/gcc.1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/gcc/gcc.1 b/contrib/gcc/gcc.1 index e04281c..d81841d 100644 --- a/contrib/gcc/gcc.1 +++ b/contrib/gcc/gcc.1 @@ -21,10 +21,10 @@ .if n .sp .if t .sp 0.4 .. -.Id $Id: gcc.1,v 1.8 1998/08/29 10:37:47 law Exp $ +.Id $Id: gcc.1,v 1.9 1998/12/16 20:55:57 law Exp $ .TH GCC 1 "\*(Dt" "GNU Tools" "GNU Tools" .SH NAME -gcc, g++ \- GNU project C and C++ Compiler (egcs-1.1.2) +gcc, g++ \- GNU project C and C++ Compiler (gcc-2.95.1) .SH SYNOPSIS .B gcc .RI "[ " option " | " filename " ].\|.\|." |