procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove cvs conflict markers.

Browse source 
From-SVN: r29983
This commit is contained in:
Richard Henderson 1999-10-14 10:44:07 -07:00
parent c1361791ef
commit 61da3d7039
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
gcc/ChangeLog
View file

@ -10,7 +10,6 @@ Wed Oct 13 00:09:18 1999 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>
* libgcc2.c (__do_global_dtors): Protect __deregister_frame_info
from multiple calls.
>>>>>>> 1.4674
Thu Oct 14 04:54:54 1999 Richard Henderson <rth@cygnus.com>
* i386.md (call value patterns): Move to the end of the file.
@ -267,7 +266,6 @@ Wed Oct 13 10:07:54 1999 Richard Henderson <rth@cygnus.com>
(struct rtvec_def): Likewise.
* tree.h (struct tree_common): Likewise.
>>>>>>> 1.4673
Wed Oct 13 01:44:29 1999 Carol LePage <carolo@hal.com>
* configure.in (sparc-hal-solaris2*): Fix xm_file, xm_defines,
@ -314,7 +312,6 @@ Tue Oct 12 07:38:41 1999 Bruce Korb <autogen@linuxbox.com>
* fixincl/fixlib.h: protect against doubly defining t_bool
* fixincl/server.h: protect against doubly defining t_bool
>>>>>>> 1.4648
Mon Oct 11 20:18:41 1999 Jim Wilson <wilson@cygnus.com>
* genoutput.c: Include toplev.h.